From 467d80ce1212a31377f362ad1267264137e496dc Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Tue, 3 Aug 2021 11:14:44 -0700 Subject: [PATCH 1/9] FIX Move gpu build to docker folder for CI --- ci/{gpu => docker}/build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ci/{gpu => docker}/build.sh (100%) diff --git a/ci/gpu/build.sh b/ci/docker/build.sh similarity index 100% rename from ci/gpu/build.sh rename to ci/docker/build.sh From c6d2ae44f1b571299175768924b5cfb3fdfec371 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Mon, 16 Aug 2021 11:24:54 -0700 Subject: [PATCH 2/9] FIX Update submodule path --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 3a8d507252..34f7169887 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "models"] path = models - url = ../../morpheus/morpheus-models.git + url = ../morpheus-models.git branch = branch-0.1-EA From f245402f02e715a122d3cdcf8b180e716ab55a43 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Mon, 16 Aug 2021 11:28:09 -0700 Subject: [PATCH 3/9] FIX Fix capitalization --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 34f7169887..6a7eff41f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "models"] path = models - url = ../morpheus-models.git + url = ../Morpheus-Models.git branch = branch-0.1-EA From 6f0f1d0f821317559009cfef20b7f1c1b6dafa94 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Mon, 16 Aug 2021 11:36:31 -0700 Subject: [PATCH 4/9] TST Test relative path for submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6a7eff41f7..7097d79dde 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "models"] path = models - url = ../Morpheus-Models.git + url = ./../Morpheus-Models.git branch = branch-0.1-EA From 3093566f6f7965d05f92575058441a2858537006 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Mon, 16 Aug 2021 12:42:21 -0700 Subject: [PATCH 5/9] FIX Update submodule --- .gitmodules | 2 +- models | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 models diff --git a/.gitmodules b/.gitmodules index 7097d79dde..2cc0fe84ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "models"] path = models - url = ./../Morpheus-Models.git + url = ./../Morpheus-Models branch = branch-0.1-EA diff --git a/models b/models new file mode 160000 index 0000000000..7d87617538 --- /dev/null +++ b/models @@ -0,0 +1 @@ +Subproject commit 7d87617538bd825950a9ecdd802db4bbf1564678 From fa307b88e3bffc91f4400de9028aa65d827b53ed Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Tue, 17 Aug 2021 10:49:20 -0700 Subject: [PATCH 6/9] TST Update channels for mamba --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 77e4275194..9a7fa814b2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-c"] # All code will be under /workspace WORKDIR /workspace -RUN /opt/conda/bin/conda install -y -n base -c conda-forge mamba && conda clean -afy +RUN /opt/conda/bin/conda install -y -n base mamba && conda clean -afy COPY docker/conda/environments/dev_cuda${CUDA_VER}.yml ./docker/conda/environments/ From 558ac00d47866d4ff9b7c76e6bada5ea366bfeaf Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Tue, 17 Aug 2021 10:58:43 -0700 Subject: [PATCH 7/9] TST Revert conda channel change --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9a7fa814b2..77e4275194 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-c"] # All code will be under /workspace WORKDIR /workspace -RUN /opt/conda/bin/conda install -y -n base mamba && conda clean -afy +RUN /opt/conda/bin/conda install -y -n base -c conda-forge mamba && conda clean -afy COPY docker/conda/environments/dev_cuda${CUDA_VER}.yml ./docker/conda/environments/ From 695faaa1cc1fb8b09f62392da23d06dd78e6852a Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Tue, 17 Aug 2021 11:41:34 -0700 Subject: [PATCH 8/9] FIX Use ssl verify false to utilize conda mirror in ci --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 77e4275194..7e1e105d0d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -27,7 +27,8 @@ SHELL ["/bin/bash", "-c"] # All code will be under /workspace WORKDIR /workspace -RUN /opt/conda/bin/conda install -y -n base -c conda-forge mamba && conda clean -afy +RUN conda config --set ssl_verify false \ + && /opt/conda/bin/conda install -y -n base -c conda-forge mamba && conda clean -afy COPY docker/conda/environments/dev_cuda${CUDA_VER}.yml ./docker/conda/environments/ From 2c6f7bae989e4c4f1fbe44e8ea1e1bb3b3d46c62 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Thu, 19 Aug 2021 17:27:59 -0700 Subject: [PATCH 9/9] FIX Change CUDA_VER to CUDA --- ci/docker/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/build.sh b/ci/docker/build.sh index 240c412990..6b3e108983 100644 --- a/ci/docker/build.sh +++ b/ci/docker/build.sh @@ -26,11 +26,11 @@ gpuci_logger ">>>> END Dockerfile <<<<" # Get build info ready gpuci_logger "Preparing build config..." -BUILD_TAG="cuda${CUDA_VER}-${LINUX_VER}-py${PYTHON_VER}" +BUILD_TAG="cuda${CUDA}-${LINUX_VER}-py${PYTHON_VER}" # Setup initial BUILD_ARGS BUILD_ARGS="--no-cache \ - --build-arg CUDA_VER=${CUDA_VER} \ + --build-arg CUDA_VER=${CUDA} \ --build-arg LINUX_VER=${LINUX_VER} \ --build-arg PYTHON_VER=${PYTHON_VER}"