-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix wrong pointer passed to Fortran MPI in FFTE #37
Closed
Closed
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
b32c165
Fix wrong pointer passed to Fortran MPI in FFTE
luszczek 8100ba5
Add FFTE building tools
luszczek d5d4896
Keep CMake versions uniform with FIBER
luszczek dbe62bd
AccFFT CPU
3586a2b
Fix
G-Ragghianti 5f7aaed
Fix
G-Ragghianti 44ff064
Changed build to occur within spack
G-Ragghianti 58e041e
Fix
G-Ragghianti 70cb93f
Fix
G-Ragghianti 7f4f475
Added 2decomp-fft suport to CI
G-Ragghianti ae75086
Added 2decomp to CI
G-Ragghianti b1e3be2
Cleaning
G-Ragghianti e310d1c
Removing python cache file
G-Ragghianti 9c946f1
Update main.yml
G-Ragghianti a51b2bb
Update main.yml
G-Ragghianti 97352cb
Update main.yml
G-Ragghianti 0b18c7e
Update spack.yaml
G-Ragghianti 03546de
Update main.yml
G-Ragghianti 57b1c58
Update main.yml
G-Ragghianti e6814c1
AccFFT CPU
luszczek acec428
Fix
G-Ragghianti c9beb13
Fix
G-Ragghianti 8e8c9b1
Changed build to occur within spack
G-Ragghianti 3b66b77
Fix
G-Ragghianti c6fe0a2
Fix
G-Ragghianti a9bd347
Added 2decomp-fft suport to CI
G-Ragghianti 5336005
Added 2decomp to CI
G-Ragghianti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
cmake_minimum_required(VERSION 3.8) | ||
|
||
project("FFTE" VERSION 7.0 LANGUAGES Fortran) | ||
|
||
find_package(MPI REQUIRED) | ||
|
||
if(CMAKE_Fortran_COMPILER_ID STREQUAL XL) | ||
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qfixed=72 -qxlf77=intarg") | ||
endif() | ||
|
||
add_library(ffte zdfft2d.f fft235.f kernel.f dzfft2d.f factor.f zdfft3d.f fftever.f dzfft3d.f mfft235.f zfft1d.f zfft2d.f zfft3d.f) | ||
# CUDA (cuzfft1d.f cuzfft3d.f cuztrans.f cuzfft2d.f) | ||
|
||
add_library(fftempi mpi/pdzfft3dv.f mpi/pzdfft3d.f mpi/pdzfft2d.f mpi/pzdfft3dv.f mpi/pzdfft2d.f mpi/pfftever.f mpi/pdzfft3d.f mpi/pfactor.f mpi/pzfft1d.f mpi/pzfft2d.f mpi/pzfft3d.f mpi/pzfft3dv.f) | ||
# CUDA (mpi/pcuzfft1d.f mpi/pcuzfft3d.f mpi/pcuzfft3dv.f mpi/pcuzfft2d.f) | ||
target_include_directories(fftempi PUBLIC ${MPI_Fortran_INCLUDE_DIRS}) | ||
target_link_libraries(fftempi ${MPI_Fortran_LIBRARIES}) | ||
|
||
foreach(par "" p) | ||
if ("${par}" STREQUAL p) | ||
set(dir mpi/tests/) | ||
set(lib fftempi ffte) | ||
else() | ||
set(dir tests/) | ||
set(lib ffte) | ||
endif() | ||
foreach(knd test rtest speed) | ||
if (${knd} STREQUAL rtest) | ||
set(strt 2) | ||
else() | ||
set(strt 1) | ||
endif() | ||
foreach(dim RANGE ${strt} 3) | ||
set(target "${par}${knd}${dim}d") | ||
add_executable(${target} "${dir}${par}${knd}${dim}d.f") | ||
set_property(TARGET ${target} PROPERTY INSTALL_RPATH_USE_LINK_PATH True) | ||
target_link_libraries(${target} ${lib}) | ||
install(TARGETS ${target} DESTINATION bin) | ||
if ("${par}" STREQUAL p AND ${dim} EQUAL 3) | ||
set(target "${par}${knd}${dim}dv") | ||
add_executable(${target} "${dir}${par}${knd}${dim}dv.f") | ||
set_property(TARGET ${target} PROPERTY INSTALL_RPATH_USE_LINK_PATH True) | ||
target_link_libraries(${target} ${lib}) | ||
install(TARGETS ${target} DESTINATION bin) | ||
endif() | ||
endforeach() | ||
endforeach() | ||
endforeach() | ||
|
||
install(TARGETS ffte fftempi DESTINATION lib) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
subroutine fftever(i,j,k) | ||
integer i,j,k | ||
i=7 | ||
j=0 | ||
k=0 | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
#! /usr/bin/env bash | ||
|
||
ver=7.0 | ||
bffte=buildffte | ||
bfiber=buildfiber | ||
|
||
date | ||
|
||
for mod in xl/16.1.1-10 spectrum-mpi/10.4.0.3-20210112 cmake/3.18.4 | ||
do | ||
module load $mod | ||
done | ||
|
||
mkdir /tmp/$USER || true | ||
cd /tmp/$USER | ||
|
||
if test -f ffte-${ver}.tgz ; then | ||
echo :FIBER: Already downloaded | ||
else | ||
echo :FIBER: Downloadig FFTE | ||
curl -OL http://ffte.jp/ffte-${ver}.tgz | ||
fi | ||
|
||
if test -d ffte-${ver} ; then | ||
echo :FIBER: Already unpacked | ||
else | ||
echo :FIBER: Unpacking FFTE | ||
tar -xzf ffte-${ver}.tgz | ||
fi | ||
|
||
if test -d fiber ; then | ||
echo :FIBER: Already cloned | ||
else | ||
echo :FIBER: Clonining FIBER branch | ||
git clone https://github.com/luszczek/fiber | ||
fi | ||
# must be on backend/ffte branch | ||
cd fiber ; git pull --rebase ; git checkout backend/ffte ; cd .. | ||
|
||
# | ||
# Setup and build FFTE | ||
# | ||
cp fiber/external/ffte/tools/CMakeLists.txt ffte-${ver} # FFTE doesnt use CMake | ||
cp fiber/external/ffte/tools/fftever.f ffte-${ver} # FFTE version | ||
cp fiber/external/ffte/tools/pfftever.f ffte-${ver}/mpi # parallel FFTE version | ||
cp ffte-${ver}/param.h ffte-${ver}/mpi # FFTE parameters for scratch buffers | ||
|
||
if test -d ${bffte} ; then | ||
echo :FIBER: Build dir already created, cleaning | ||
rm -r ${bffte}/* | ||
else | ||
mkdir ${bffte} | ||
fi | ||
echo :FIBER: Building FFTE | ||
cd ${bffte} ; cmake -D CMAKE_INSTALL_PREFIX=/tmp/$USER/usr ../ffte-${ver} ; make -j ; make install ; cd .. | ||
|
||
# | ||
# Setup and build FFTE | ||
# | ||
if test -d ${bfiber} ; then | ||
echo :FIBER: Build dir already created, cleaning | ||
rm -r ${bfiber}/* | ||
else | ||
mkdir ${bfiber} | ||
fi | ||
echo :FIBER: Building FIBER | ||
cd ${bfiber} ; cmake -D CMAKE_INSTALL_PREFIX=/tmp/$USER/usr -D FIBER_FFT_LIB_DIRS=/tmp/$USER/usr/lib -D FIBER_ENABLE_FFTE=ON ../fiber ; make -j ; make install ; cd .. | ||
|
||
echo :FIBER: Benchmarks installed in /tmp/$USER/${bfiber}/benchmarks | ||
|
||
date | ||
|
||
exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
subroutine pfftever(i,j,k) | ||
integer i,j,k | ||
i=7 | ||
j=0 | ||
k=0 | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For uniformity, I would suggest to keep the same 3.10 version as in the main CMakeList?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not for FIBER. This is for those who build FFTE with CMake. FFTE provides only Makefile's for their tests and nothing else. FFTE doesn't need a new CMake version than 3.8 that has features for libraries and for CUDA language.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I pushed d5d4896 to make them uniform