Merge branch 'feature/hotfix/gpucleanup' into 'release'

Feature/hotfix/gpucleanup

See merge request elixxir/integration!116

.gitlab-ci.yml

@@ -82,15 +82,15 @@ basice2e:
     - rm -fr results
     - rm -fr results-cpu
     - rm -fr results-gpu
-    - ls -lha
-    - ./run.sh
-    - mv results results-cpu
-    - sleep 60
+    # - ls -lha
+    # - ./run.sh
+    # - mv results results-cpu
+    # - sleep 60
     - mkdir -p /opt/xxnetwork/lib
     - cp ../bin/libpowmosm75.so /opt/xxnetwork/lib/
     - cp ../bin/libpow.fatbin /opt/xxnetwork/lib/
     - sed -i 's/bin\/server/bin\/server-cuda/g' run.sh
-    - sed -i 's/useGpu\:\ false/useGpu\:\ true/g' server-[12345].yaml
+    - sed -i 's/useGPU\:\ false/useGPU\:\ true/g' server-[12345].yaml
     - NSYSENABLED=TRUE ./run.sh
     - mv results results-gpu
     - cd ..

download_cmix_binaries.sh

@@ -84,7 +84,7 @@ for BRANCH in $(echo "forcedbranch" $FBRANCH $FBRANCH2 $DEFAULTBRANCH); do
         CLIENT_URL=${CLIENT_URL:="${REPOS_API}client/$BRANCH_URL/client$BIN"}
         SERVER_GPU_URL=${SERVER_GPU_URL:="${REPOS_API}server/$BRANCH_URL/server-cuda.linux64?job=build"}
         GPULIB_URL=${GPULIB_URL:="${REPOS_API}server/$BRANCH_URL/libpowmosm75.so?job=build"}
-        GPULIB2_URL=${GPULIB_URL:="${REPOS_API}server/$BRANCH_URL/libpow.fatbin?job=build"}
+        GPULIB2_URL=${GPULIB2_URL:="${REPOS_API}server/$BRANCH_URL/libpow.fatbin?job=build"}
     else
         UDB_URL=${UDB_URL:="${REPOS_API}/$BRANCH/udb$BIN"}
         SERVER_URL=${SERVER_URL:="${REPOS_API}/$BRANCH/server$BIN"}
@@ -147,6 +147,7 @@ fi
     unset CLIENT_URL
     unset SERVER_GPU_URL
     unset GPULIB_URL
+    unset GPULIB2_URL
 done
 
 # Make binaries executable