additions to compile and run on Matt's HP laptop with Ubuntu OS

ORNL-Fusion · Mar 5, 2024 · 42d6b78 · 42d6b78
1 parent d39dc85
commit 42d6b78
Showing 1 changed file with 37 additions and 14 deletions.
diff --git a/setup_cmake b/setup_cmake
@@ -85,7 +85,7 @@ then
       -DNIMSLU_LIBRARIES=/Users/21b/Desktop/NIMROD/NIMUW/externals/libsslu_dummy.a \
       -DNIMLUD_LIBRARIES=/Users/21b/Desktop/NIMROD/NIMUW/externals/libslud_dummy.a \
 
-elif [ $NAME == "lap141014" ]
+elif [ $MACHINE_ID == "LAP141014" ]
 then
     # Config for Matt Beidler's WSL2/Ubuntu build
 
@@ -94,7 +94,8 @@ then
 
     rm -rf ./build && mkdir $_
 
-    COMPILER_TYPE=GNU
+    COMPILER_TYPE=NV
+    HARDWARE_TYPE=GPU
 
     if [ "$COMPILER_TYPE" == GNU ]
     then
@@ -116,19 +117,41 @@ then
         -DCMAKE_CXX_FLAGS_DEBUG="-g" \
 
     elif [ "$COMPILER_TYPE" == NV ]
-
-      cmake \
-        -DCMAKE_BUILD_TYPE:String=$BUILD_TYPE \
-        -DUSE_OMP=ON \
-        -DCMAKE_Fortran_FLAGS="-Mfree -Mpreprocess -fPIC -O3 -mp -Mvect=simd:256 -Mbyteswapio -DHDF5_DOUBLE_PRESICION" \
-        -DCMAKE_Fortran_FLAGS_DEBUG="-g -Minfo=all -Minstrument -traceback -lnvhpcwrapnvtx" \
-        -DCMAKE_C_FLAGS="-O3 -mp -Mvect=simd:256" \
-        -DCMAKE_C_FLAGS_DEBUG="-g -Minfo=all -traceback" \
-        -DCMAKE_CXX_FLAGS="-O3 -std=c++11 -mp -Mvect=simd:256" \
-        -DCMAKE_CXX_FLAGS_DEBUG="-g -Minfo=all -traceback" \
-        -DUSE_PSPLINE=ON \
     then
-        echo " choose a valid compiler type "
+      if [ "$HARDWARE_TYPE" == CPU ]
+      then
+        cmake \
+          -DCMAKE_BUILD_TYPE:String=$BUILD_TYPE \
+          -DUSE_OMP=ON \
+          -DCMAKE_Fortran_FLAGS="-Mfree -Mpreprocess -fPIC -O3 -mp -Mvect=simd:256 -c++libs -Mbyteswapio -DHDF5_DOUBLE_PRESICION" \
+          -DCMAKE_Fortran_FLAGS_DEBUG="-g -Minfo=all -Minstrument -traceback -lnvhpcwrapnvtx" \
+          -DCMAKE_C_FLAGS="-O3 -mp -Mvect=simd:256" \
+          -DCMAKE_C_FLAGS_DEBUG="-g -Minfo=all -traceback" \
+          -DCMAKE_CXX_FLAGS="-O3 -std=c++11 -mp -Mvect=simd:256" \
+          -DCMAKE_CXX_FLAGS_DEBUG="-g -Minfo=all -traceback" \
+          -DUSE_PSPLINE=ON 
+
+      elif [ "$HARDWARE_TYPE" == GPU ]
+      then
+        cmake \
+          -DCMAKE_BUILD_TYPE:String=$BUILD_TYPE \
+          -DUSE_OMP=OFF \
+          -DUSE_ACC=ON \
+          -DUSE_PSPLINE=ON \
+          -DCMAKE_Fortran_FLAGS="-fast -acc=gpu -gpu=deepcopy -Mfree -fPIC -O3 -c++libs -Mpreprocess -DHDF5_DOUBLE_PRESICION" \
+          -DCMAKE_Fortran_FLAGS_DEBUG="-g -Minfo=all -Minstrument -traceback -lnvhpcwrapnvtx" \
+          -DCMAKE_C_FLAGS="-O3 -mp" \
+          -DCMAKE_C_FLAGS_DEBUG="-g -Minfo=all -traceback" \
+          -DCMAKE_CXX_FLAGS="-O3 -std=c++11 -mp" \
+          -DCMAKE_CXX_FLAGS_DEBUG="-g -Minfo=all -traceback" 
+
+      else
+        echo " choose a valid hardware type "
+      fi
+
+
+    else
+      echo " choose a valid compiler type "
     fi