Skip to content
Snippets Groups Projects
Commit 32591650 authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Merge branch 'release' into feature/hotfix/gpucleanup

parents 95980ec9 a2ebc7ca
No related branches found
No related tags found
1 merge request!4Release
......@@ -57,6 +57,7 @@ installbinaries:
- ./download_cmix_binaries.sh l d
- mkdir -p /opt/xxnetwork/lib
- cp bin/libpowmosm75.so /opt/xxnetwork/lib/
- cp bin/libpow.fatbin /opt/xxnetwork/lib/
- "chmod +x *"
- bin/server version
- bin/server-cuda version
......@@ -87,6 +88,7 @@ basice2e:
# - 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
- NSYSENABLED=TRUE ./run.sh
......
......@@ -84,6 +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"}
else
UDB_URL=${UDB_URL:="${REPOS_API}/$BRANCH/udb$BIN"}
SERVER_URL=${SERVER_URL:="${REPOS_API}/$BRANCH/server$BIN"}
......@@ -129,6 +130,10 @@ if [[ $2 == "d" ]]; then
if [ ! -f $download_path/libpowmosm75.so ] && [[ "$GPULIB_URL" != *"forcedbranch"* ]]; then
curl -s -f -L -H "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" -o "$download_path/libpowmosm75.so" ${GPULIB_URL}
fi
# Silently download the GPU Library to the provisioning directory
if [ ! -f $download_path/libpow.fatbin ] && [[ "$GPULIB2_URL" != *"forcedbranch"* ]]; then
curl -s -f -L -H "PRIVATE-TOKEN: $GITLAB_ACCESS_TOKEN" -o "$download_path/libpow.fatbin" ${GPULIB2_URL}
fi
fi
set +x
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment