Skip to content
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
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions external/ffte/tools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
cmake_minimum_required(VERSION 3.8)

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?

Copy link
Contributor Author

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.

Copy link
Contributor Author

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


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)
6 changes: 6 additions & 0 deletions external/ffte/tools/fftever.f
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
73 changes: 73 additions & 0 deletions external/ffte/tools/fiberfft.sh
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
6 changes: 6 additions & 0 deletions external/ffte/tools/pfftever.f
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