Skip to content

Commit

Permalink
Testing mpich build
Browse files Browse the repository at this point in the history
also fixed bug
  • Loading branch information
ShatrovOA committed Oct 24, 2024
1 parent e85d17b commit 011a15a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if(DTFFT_BUILD_SHARED)
else()
add_library(dtfft STATIC)
endif()
target_include_directories(dtfft PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${PROJECT_SOURCE_DIR}/src/include>)
target_include_directories(dtfft PRIVATE ${PROJECT_SOURCE_DIR}/src/include)
target_include_directories(dtfft PRIVATE ${PROJECT_BINARY_DIR})

set(DTFFT_MODULE_DIR ${PROJECT_BINARY_DIR}/mod)
Expand All @@ -91,7 +91,7 @@ set_target_properties(dtfft PROPERTIES VERSION ${CMAKE_PROJECT_VERSION})
set(DTFFT_HEADER_DIR "${PROJECT_SOURCE_DIR}/include")
SET(DTFFT_MODULE "${DTFFT_MODULE_DIR}/dtfft.mod")
SET(DTFFT_HEADERS "${DTFFT_MODULE};${DTFFT_HEADER_DIR}/dtfft.f03")
target_link_libraries(dtfft PRIVATE MPI::MPI_Fortran)
target_link_libraries(dtfft PRIVATE MPI::MPI_Fortran MPI::MPI_C)
if(DTFFT_BUILD_C_CXX_API)
set(DTFFT_HEADERS "${DTFFT_HEADERS};${DTFFT_HEADER_DIR}/dtfft.h;${DTFFT_HEADER_DIR}/dtfft.hpp;${DTFFT_CONF_HEADER}")
target_link_libraries(dtfft PRIVATE MPI::MPI_CXX)
Expand Down
2 changes: 1 addition & 1 deletion src/dtfft_core_m.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ integer(IP) function check_create_args(self, dims, comm, precision, effort_flag,
endif
if ( self%executor_type == DTFFT_EXECUTOR_NONE ) self%is_transpose_plan = .true.

if ( present(kinds) ) then
if ( present(kinds) .and. .not. self%is_transpose_plan ) then
do dim = 1, self%ndims
if ( .not.any([(kinds(dim) == VALID_R2R_FFTS)]) ) then
check_create_args = DTFFT_ERROR_INVALID_R2R_KINDS
Expand Down

0 comments on commit 011a15a

Please sign in to comment.