Skip to content

Commit 2f0b974

Browse files
committed
fix amd compling error; updated frontier build script
1 parent e23aa27 commit 2f0b974

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,8 @@ endif()
579579

580580
include_directories(${CMAKE_BINARY_DIR}/SRC) # For superlu_dist_config.h
581581
include_directories(${CMAKE_SOURCE_DIR}/SRC/include)
582+
include_directories(${CMAKE_SOURCE_DIR}/SRC/cuda)
583+
include_directories(${CMAKE_SOURCE_DIR}/SRC/hip)
582584
if (TPL_PARMETIS_INCLUDE_DIRS)
583585
include_directories(${TPL_PARMETIS_INCLUDE_DIRS}) ## parmetis
584586
endif ()

SRC/double/pdgssvx3d.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,7 @@ void pdgssvx3d(superlu_dist_options_t *options, SuperMatrix *A,
10311031

10321032
if(options->batchCount == 0)
10331033
{
1034+
#ifdef HAVE_CUDA
10341035
dLUgpu_Handle dLUgpu = dCreateLUgpuHandle(nsupers, ldt, trf3Dpartition, LUstruct, grid3d,
10351036
SCT, options, stat, thresh, info);
10361037

@@ -1039,7 +1040,7 @@ dLUgpu_Handle dLUgpu = dCreateLUgpuHandle(nsupers, ldt, trf3Dpartition, LUstruct
10391040

10401041
dCopyLUGPU2Host(dLUgpu, LUstruct);
10411042
dDestroyLUgpuHandle(dLUgpu);
1042-
1043+
#endif
10431044
} else { /* batched version */
10441045

10451046
#ifdef HAVE_MAGMA

example_scripts/run_cmake_build_frontier_gnu_gpu_hip_amd.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/bash
22
# module load parmetis/4.0.3
33
module load PrgEnv-gnu
4-
module load gcc/11.2.0
5-
module load cray-mpich/8.1.23 # version recommended in Jan 30 email
4+
# module load gcc/11.2.0
5+
# module load cray-mpich/8.1.23
66
module load craype-accel-amd-gfx90a # for GPU aware MPI
7-
module load rocm/5.2.0 # version recommended in Jan 30 email
7+
# module load rocm/6.2.0
8+
module load rrocm/5.7.1
89
export MPICH_GPU_SUPPORT_ENABLED=1
910
module load cmake
1011

@@ -29,17 +30,17 @@ rm -rf DartConfiguration.tcl
2930

3031
cmake .. \
3132
-DTPL_PARMETIS_INCLUDE_DIRS="${PARMETIS_ROOT}/include;${PARMETIS_ROOT}/metis/include" \
32-
-DTPL_PARMETIS_LIBRARIES="${PARMETIS_BUILD_DIR}/libparmetis/libparmetis.so;${PARMETIS_BUILD_DIR}/libmetis/libmetis.so;${OLCF_ROCM_ROOT}/lib/libroctx64.so;${OLCF_ROCM_ROOT}/lib/libroctracer64.so" \
33+
-DTPL_PARMETIS_LIBRARIES="${PARMETIS_BUILD_DIR}/libparmetis/libparmetis.so;${PARMETIS_BUILD_DIR}/libmetis/libmetis.so;${CRAY_ROCM_DIR}/lib/libroctx64.so;${CRAY_ROCM_DIR}/lib/libroctracer64.so" \
3334
-DBUILD_SHARED_LIBS=OFF \
3435
-DCMAKE_Fortran_COMPILER=ftn \
3536
-DCMAKE_C_COMPILER=cc \
3637
-DCMAKE_CXX_COMPILER=CC \
3738
-DCMAKE_INSTALL_PREFIX=. \
38-
-DTPL_BLAS_LIBRARIES="${CRAY_LIBSCI_PREFIX_DIR}/lib/libsci_gnu_82_mp.so" \
39-
-DTPL_LAPACK_LIBRARIES="${CRAY_LIBSCI_PREFIX_DIR}/lib/libsci_gnu_82_mp.so" \
39+
-DTPL_BLAS_LIBRARIES="${CRAY_LIBSCI_PREFIX_DIR}/lib/libsci_gnu_123_mp.so" \
40+
-DTPL_LAPACK_LIBRARIES="${CRAY_LIBSCI_PREFIX_DIR}/lib/libsci_gnu_123_mp.so" \
4041
-DCMAKE_BUILD_TYPE=Release \
4142
-DTPL_ENABLE_HIPLIB=TRUE \
42-
-DHIP_HIPCC_FLAGS="--amdgpu-target=gfx90a -I${CRAY_MPICH_DIR}/include" \
43+
-DHIP_HIPCC_FLAGS="--offload-arch=gfx90a -I${CRAY_MPICH_DIR}/include" \
4344
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
4445
-DCMAKE_CXX_FLAGS="-Wno-format -Wno-unused-value -Wno-return-type -Wno-unsequenced -Wno-switch -Wno-parentheses -DPRNTlevel=1 -DPROFlevel=0 -DDEBUGlevel=0 " \
4546
-DCMAKE_C_FLAGS="-Wno-format -Wno-unused-value -Wno-return-type -Wno-unsequenced -Wno-switch -Wno-parentheses -DPRNTlevel=1 -DPROFlevel=0 -DDEBUGlevel=0 "

0 commit comments

Comments
 (0)