Commit ff7c4b9e authored by Berrill, Mark's avatar Berrill, Mark
Browse files

Updating hip branch to master

parents 6726c4de 0aa84331

.gitignore

+15 −0
Original line number Diff line number Diff line
@@ -9,5 +9,20 @@ build/*install* 
build/*interp*

build/*null_timer

build/*lib*

build/*compile_commands.json

build/*core.*

build/*/*CreateImage

build/*/*Ray*

build/*/*Makefile

build/*/*bin

build/*/*CMake*

build/*/*cmake*

build/*/*include

build/*/*install*

build/*/*interp*

build/*/*null_timer

build/*/*lib*

build/*/*compile_commands.json

build/*/*core.*

build/*/*~

build/pgi/*.lst

build/configure

+6 −5
Original line number Diff line number Diff line
@@ -4,17 +4,18 @@ export KOKKOS_DIR=/packages/TPLs/install/opt/kokkos 


rm -rf CMake*



/ccs/home/mbt/bin/cmake                 \

cmake                                   \

   -D CMAKE_BUILD_TYPE=Release          \

   -D CMAKE_CXX_COMPILER=hipcc            \

   -D CXX_STD=11                        \

      -D LDFLAGS="-pthread"  \

   -D CMAKE_CXX_COMPILER=mpic++         \

   -D CMAKE_CXX_STANDARD=11             \

   -D USE_OPENACC=0                     \

   -D USE_OPENMP=0                      \

   -D USE_KOKKOS=0                      \

      -D KOKKOS_DIRECTORY=${KOKKOS_DIR} \

      -D KOKKOS_WRAPPER=${KOKKOS_DIR}/nvcc_wrapper \

   -D USE_CUDA=1                        \

   -D USE_CUDA=0                        \

      -D CUDA_FLAGS="-arch sm_30"       \

   -D USE_HIP=1                         \

      -D HIP_NVCC_OPTIONS="-arch sm_30"   \

   ../src

build/gnu/configure_summit

+3 −2
Original line number Diff line number Diff line
@@ -12,13 +12,14 @@ cmake \ 
   -D CMAKE_BUILD_TYPE=Release          \

   -D CMAKE_CXX_COMPILER=g++            \

   -D CMAKE_CXX_FLAGS_RELEASE="-Ofast -DNDEBUG" \

   -D CXX_STD=11                        \

   -D CMAKE_CXX_STANDARD=11             \

   -D CMAKE_CUDA_STANDARD=11            \

   -D USE_OPENACC=0                     \

   -D USE_OPENMP=1                      \

   -D USE_KOKKOS=0                      \

      -D KOKKOS_DIRECTORY=${KOKKOS_DIR} \

      -D KOKKOS_WRAPPER=${KOKKOS_DIR}/bin/nvcc_wrapper \

   -D USE_CUDA=1                        \

      -D CUDA_FLAGS="-arch sm_70"       \

      -D CMAKE_CUDA_FLAGS="-arch sm_70" \

   ../../src

build/gnu_acc/configure_summit

0 → 100755
+22 −0
Original line number Diff line number Diff line 
module unload clang gnu pgi xlf cuda kokkos cmake

module load pgi

module load cmake

module load cuda





rm -rf CMake*



cmake                                   \

   -D CMAKE_BUILD_TYPE=Release          \

   -D CMAKE_CXX_COMPILER=/sw/peak/gcc/7.1.1-acc-20180420/bin/g++ \

   -D CMAKE_CXX_FLAGS="-O3 -fopenacc -lm -foffload=-lm" \

   -D CXX_STD=11                        \

   -D USE_OPENACC=1                     \

   -D USE_OPENMP=0                      \

   -D USE_KOKKOS=0                      \

      -D KOKKOS_DIRECTORY=${KOKKOS_DIR} \

      -D KOKKOS_WRAPPER=${KOKKOS_DIR}/bin/nvcc_wrapper \

   -D USE_CUDA=0                        \

      -D CUDA_FLAGS="-arch sm_70"       \

   ../../src

build/llvm/configure_summit

0 → 100755
+23 −0
Original line number Diff line number Diff line 
module unload clang gnu pgi xlf cuda kokkos cmake

module load llvm

module load cuda

module load cmake





rm -rf CMake*



cmake                                   \

   -D CMAKE_BUILD_TYPE=Release          \

   -D CMAKE_CXX_COMPILER=clang++        \

   -D CMAKE_CXX_FLAGS_RELEASE="-Ofast -DNDEBUG" \

   -D CMAKE_CXX_STANDARD=11             \

   -D CMAKE_CUDA_STANDARD=11            \

   -D USE_OPENACC=0                     \

   -D USE_OPENMP=1                      \

   -D USE_KOKKOS=0                      \

      -D KOKKOS_DIRECTORY=${KOKKOS_DIR} \

      -D KOKKOS_WRAPPER=${KOKKOS_DIR}/bin/nvcc_wrapper \

   -D USE_CUDA=1                        \

      -D CMAKE_CUDA_FLAGS="-arch sm_70" \

   ../../src