fix whitespace merge issue

This commit is contained in:
James E McClure
2022-02-03 09:15:28 -05:00
41 changed files with 1366 additions and 255 deletions

9
sample_scripts/Hipify.sh Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/bash
echo "Hipify cuda file $1"
sed -i 's/cudaError_t/hipError_t/g' $1
sed -i 's/cudaGetLastError/hipGetLastError/g' $1
sed -i 's/cudaSuccess/hipSuccess/g' $1
sed -i 's/cudaGetErrorString/hipGetErrorString/g' $1
sed -i 's/CUDA error/hip error/g' $1

View File

@@ -5,19 +5,16 @@ cmake -D CMAKE_C_COMPILER:PATH=/opt/arden/openmpi/3.1.2/bin/mpicc \
-D CMAKE_C_FLAGS="-O3 -fPIC" \
-D CMAKE_CXX_FLAGS="-O3 -fPIC " \
-D CMAKE_CXX_STANDARD=14 \
-D MPIEXEC=mpirun \
-D MPIEXEC=mpirun \
-D CMAKE_BUILD_PARALLEL_LEVEL=4 \
-D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \
-D CMAKE_BUILD_TYPE:STRING=Release \
-D CUDA_FLAGS="-arch sm_35" \
-D CUDA_HOST_COMPILER="/usr/bin/gcc" \
-D USE_HDF5=1 \
-D HDF5_DIRECTORY="/opt/arden/hdf5/1.8.12" \
-D HDF5_LIB="/opt/arden/hdf5/1.8.12/lib/libhdf5.a"\
-D USE_SILO=1 \
-D SILO_LIB="/opt/arden/silo/4.10.2/lib/libsiloh5.a" \
-D SILO_DIRECTORY="/opt/arden/silo/4.10.2" \
-D USE_NETCDF=0 \
-D NETCDF_DIRECTORY="/opt/arden/netcdf/4.6.1" \
-D USE_CUDA=0 \
-D USE_TIMER=0 \
~/Programs/LBPM
~/Programs/LBPM-WIA
# -D HDF5_LIB="/opt/arden/hdf5/1.8.12/lib/libhdf5.a"\

View File

@@ -2,19 +2,23 @@
#module load cmake
#source /gpfs/gpfs_stage1/b6p315aa/setup/setup-mpi.sh
module load cmake gcc
module load cmake gcc/7.5.0
module load cuda
#/ccs/proj/csc380/mcclurej
export HDF5_DIR=/ccs/proj/csc380/mcclurej/install/hdf5/1.8.12/
export SILO_DIR=/ccs/proj/csc380/mcclurej/install/silo/4.10.2/
export NETCDF_DIR=/ccs/proj/geo136/install/netcdf/4.6.1
module load hdf5
#/ccs/proj/csc380/mcclurej
#export HDF5_DIR=/ccs/proj/csc380/mcclurej/install/hdf5/1.8.12/
#export SILO_DIR=/ccs/proj/csc380/mcclurej/install/silo/4.10.2/
#export NETCDF_DIR=/ccs/proj/geo136/install/netcdf/4.6.1
export HDF5_DIR="$OLCF_HDF5_ROOT"
# configure
rm -rf CMake*
cmake \
-D CMAKE_BUILD_TYPE:STRING=Release \
-D CMAKE_C_COMPILER:PATH=mpicc \
-D CMAKE_CXX_COMPILER:PATH=mpicxx \
-D CMAKE_CXX_FLAGS="-lstdc++" \
-D CMAKE_CXX_STANDARD=14 \
-D USE_CUDA=1 \
-D CMAKE_CUDA_FLAGS="-arch sm_70 -Xptxas=-v -Xptxas -dlcm=cg -lineinfo" \
@@ -25,7 +29,7 @@ cmake \
-D USE_HDF5=1 \
-D HDF5_DIRECTORY="$HDF5_DIR" \
-D HDF5_LIB="$HDF5_DIR/lib/libhdf5.a" \
-D USE_SILO=1 \
-D USE_SILO=0 \
-D SILO_LIB="$SILO_DIR/lib/libsiloh5.a" \
-D SILO_DIRECTORY="$SILO_DIR" \
-D USE_NETCDF=0 \

View File

@@ -0,0 +1,33 @@
# load the module for cmake
module reset
module load CMake
#module load CUDA
#module load OpenMPI
#module load cuda11.2/toolkit
module load OpenMPI/4.0.5-gcccuda-2020b
module load HDF5
#export GCC_BIN=/apps/easybuild/software/tinkercliffs-rome_a100/GCCcore/10.2.0/bin
cmake \
-D CMAKE_C_COMPILER:PATH=mpicc \
-D CMAKE_CXX_COMPILER:PATH=mpicxx \
-D CMAKE_C_FLAGS="-fPIC" \
-D CMAKE_CXX_FLAGS="-fPIC" \
-D MPIEXEC=mpirun \
-D USE_EXT_MPI_FOR_SERIAL_TESTS:BOOL=TRUE \
-D CMAKE_BUILD_TYPE:STRING=Release \
-D USE_CUDA=1 \
-D CMAKE_CUDA_FLAGS="-arch sm_80" \
-D CMAKE_CUDA_HOST_COMPILER="$GCC_BIN/gcc" \
-D USE_HDF5=1 \
-D HDF5_DIRECTORY=$HDF5_DIR \
-D USE_SILO=0 \
-D SILO_DIRECTORY=$SILO_DIR \
-D USE_TIMER=0 \
~/LBPM-WIA
make VERBOSE=1 -j4 && make install