Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
waLBerla
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arash Partow
waLBerla
Commits
eb17987b
Commit
eb17987b
authored
2 years ago
by
Christoph Schwarzmeier
Browse files
Options
Downloads
Plain Diff
Merge branch 'thoennes/fftw-option' into 'master'
Add option to disable fftw See merge request
walberla/walberla!558
parents
1d622391
e77599b7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
CMakeLists.txt
+19
-16
19 additions, 16 deletions
CMakeLists.txt
with
21 additions
and
16 deletions
.gitlab-ci.yml
+
2
−
0
View file @
eb17987b
...
@@ -50,6 +50,7 @@ stages:
...
@@ -50,6 +50,7 @@ stages:
-DWARNING_ERROR=ON
-DWARNING_ERROR=ON
-DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS
-DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS
-DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS
-DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS
-DWALBERLA_BUILD_WITH_FFTW=$WALBERLA_BUILD_WITH_FFTW
-DWALBERLA_ENABLE_GUI=$WALBERLA_ENABLE_GUI
-DWALBERLA_ENABLE_GUI=$WALBERLA_ENABLE_GUI
-DWALBERLA_BUILD_WITH_CODEGEN=$WALBERLA_BUILD_WITH_CODEGEN
-DWALBERLA_BUILD_WITH_CODEGEN=$WALBERLA_BUILD_WITH_CODEGEN
-DWALBERLA_STL_BOUNDS_CHECKS=$WALBERLA_STL_BOUNDS_CHECKS
-DWALBERLA_STL_BOUNDS_CHECKS=$WALBERLA_STL_BOUNDS_CHECKS
...
@@ -72,6 +73,7 @@ stages:
...
@@ -72,6 +73,7 @@ stages:
WALBERLA_DOUBLE_ACCURACY
:
"
ON"
WALBERLA_DOUBLE_ACCURACY
:
"
ON"
WALBERLA_BUILD_WITH_METIS
:
"
ON"
WALBERLA_BUILD_WITH_METIS
:
"
ON"
WALBERLA_BUILD_WITH_PARMETIS
:
"
ON"
WALBERLA_BUILD_WITH_PARMETIS
:
"
ON"
WALBERLA_BUILD_WITH_FFTW
:
"
ON"
WALBERLA_ENABLE_GUI
:
"
OFF"
WALBERLA_ENABLE_GUI
:
"
OFF"
artifacts
:
artifacts
:
when
:
always
when
:
always
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
19
−
16
View file @
eb17987b
...
@@ -69,6 +69,7 @@ option ( WALBERLA_BUILD_DOC "Build Documentation"
...
@@ -69,6 +69,7 @@ option ( WALBERLA_BUILD_DOC "Build Documentation"
option
(
WALBERLA_BUILD_WITH_MPI
"Build with MPI"
ON
)
option
(
WALBERLA_BUILD_WITH_MPI
"Build with MPI"
ON
)
option
(
WALBERLA_BUILD_WITH_METIS
"Build with metis graph partitioner"
OFF
)
option
(
WALBERLA_BUILD_WITH_METIS
"Build with metis graph partitioner"
OFF
)
option
(
WALBERLA_BUILD_WITH_PARMETIS
"Build with ParMetis graph partitioner"
OFF
)
option
(
WALBERLA_BUILD_WITH_PARMETIS
"Build with ParMetis graph partitioner"
OFF
)
option
(
WALBERLA_BUILD_WITH_FFTW
"Build with FFTW Fourier Transform library"
OFF
)
option
(
WALBERLA_BUILD_WITH_GPROF
"Enables gprof"
)
option
(
WALBERLA_BUILD_WITH_GPROF
"Enables gprof"
)
option
(
WALBERLA_BUILD_WITH_GCOV
"Enables gcov"
)
option
(
WALBERLA_BUILD_WITH_GCOV
"Enables gcov"
)
...
@@ -920,22 +921,24 @@ endif()
...
@@ -920,22 +921,24 @@ endif()
##
##
############################################################################################################################
############################################################################################################################
if
(
WALBERLA_BUILD_WITH_MPI
)
if
(
WALBERLA_BUILD_WITH_FFTW
)
find_package
(
PFFT
)
if
(
WALBERLA_BUILD_WITH_MPI
)
find_package
(
FFTW3
)
find_package
(
PFFT
)
set
(
FFT_REQUIRED_LIBRARIES pfft fftw3_mpi fftw3
)
find_package
(
FFTW3
)
if
(
PFFT_FOUND AND FFTW3_MPI_FOUND
)
set
(
FFT_REQUIRED_LIBRARIES pfft fftw3_mpi fftw3
)
set
(
WALBERLA_BUILD_WITH_FFT TRUE CACHE INTERNAL
"Build with FFT"
)
if
(
PFFT_FOUND AND FFTW3_MPI_FOUND
)
include_directories
(
SYSTEM
${
PFFT_INCLUDE_DIR
}
${
FFTW3_MPI_INCLUDE_DIR
}
)
set
(
WALBERLA_BUILD_WITH_FFT TRUE CACHE INTERNAL
"Build with FFT"
)
list
(
APPEND SERVICE_LIBS
${
PFFT_LIBRARIES
}
${
FFTW3_LIBRARIES
}
${
FFTW3_MPI_LIBRARIES
}
)
include_directories
(
SYSTEM
${
PFFT_INCLUDE_DIR
}
${
FFTW3_MPI_INCLUDE_DIR
}
)
endif
()
list
(
APPEND SERVICE_LIBS
${
PFFT_LIBRARIES
}
${
FFTW3_LIBRARIES
}
${
FFTW3_MPI_LIBRARIES
}
)
else
()
endif
()
find_package
(
FFTW3
)
else
()
set
(
FFT_REQUIRED_LIBRARIES fftw3
)
find_package
(
FFTW3
)
if
(
FFTW3_FOUND
)
set
(
FFT_REQUIRED_LIBRARIES fftw3
)
set
(
WALBERLA_BUILD_WITH_FFT TRUE CACHE INTERNAL
"Build with FFT"
)
if
(
FFTW3_FOUND
)
include_directories
(
SYSTEM
${
FFTW3_INCLUDE_DIR
}
)
set
(
WALBERLA_BUILD_WITH_FFT TRUE CACHE INTERNAL
"Build with FFT"
)
list
(
APPEND SERVICE_LIBS
${
FFTW3_LIBRARIES
}
)
include_directories
(
SYSTEM
${
FFTW3_INCLUDE_DIR
}
)
list
(
APPEND SERVICE_LIBS
${
FFTW3_LIBRARIES
}
)
endif
()
endif
()
endif
()
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment