From 514e8314e9e503f46f7a30754c9f6e271e6cf342 Mon Sep 17 00:00:00 2001 From: Antoni Viros i Martin Date: Wed, 25 Oct 2023 12:50:27 -0400 Subject: [PATCH 1/6] Redo isntallation order --- nightly-pytorch-compile-clang/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nightly-pytorch-compile-clang/Dockerfile b/nightly-pytorch-compile-clang/Dockerfile index 18e77b8..e678981 100644 --- a/nightly-pytorch-compile-clang/Dockerfile +++ b/nightly-pytorch-compile-clang/Dockerfile @@ -6,13 +6,13 @@ ENV HOME=/homedir \ # tools RUN apt-get -y -o Acquire::Max-FutureTime=86400 update && \ + apt-get install -y gnupg vim nmon clang software-properties-common && \ apt-key del 7fa2af80 && \ add-apt-repository contrib && \ wget https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/cuda-keyring_1.0-1_all.deb && \ dpkg -i cuda-keyring_1.0-1_all.deb && \ apt-get -y -o Acquire::Max-FutureTime=86400 update && \ - apt-get install -y gnupg vim nmon clang software-properties-common && \ - apt-get install -y cuda-compiler-12-1 cuda-nsight-systems-12-1 && \ + apt-get install -y clang cuda-compiler-12-1 cuda-nsight-systems-12-1 && \ apt-get -y clean RUN chgrp -R 0 /opt/conda && \ From abf8e86655c012c7a67fb3e8cc09e7f96246927e Mon Sep 17 00:00:00 2001 From: Antoni Viros i Martin Date: Wed, 25 Oct 2023 13:23:22 -0400 Subject: [PATCH 2/6] remove clang --- nightly-pytorch-compile-clang/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nightly-pytorch-compile-clang/Dockerfile b/nightly-pytorch-compile-clang/Dockerfile index e678981..bcae3a1 100644 --- a/nightly-pytorch-compile-clang/Dockerfile +++ b/nightly-pytorch-compile-clang/Dockerfile @@ -6,7 +6,7 @@ ENV HOME=/homedir \ # tools RUN apt-get -y -o Acquire::Max-FutureTime=86400 update && \ - apt-get install -y gnupg vim nmon clang software-properties-common && \ + apt-get install -y gnupg vim nmon software-properties-common && \ apt-key del 7fa2af80 && \ add-apt-repository contrib && \ wget https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/cuda-keyring_1.0-1_all.deb && \ From 81127d4ce8968e2f779d82c741a13dcb2974a76a Mon Sep 17 00:00:00 2001 From: Antoni Viros i Martin Date: Wed, 25 Oct 2023 13:42:46 -0400 Subject: [PATCH 3/6] set clang default --- nightly-pytorch-compile-clang/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nightly-pytorch-compile-clang/Dockerfile b/nightly-pytorch-compile-clang/Dockerfile index bcae3a1..d0a7f21 100644 --- a/nightly-pytorch-compile-clang/Dockerfile +++ b/nightly-pytorch-compile-clang/Dockerfile @@ -13,7 +13,9 @@ RUN apt-get -y -o Acquire::Max-FutureTime=86400 update && \ dpkg -i cuda-keyring_1.0-1_all.deb && \ apt-get -y -o Acquire::Max-FutureTime=86400 update && \ apt-get install -y clang cuda-compiler-12-1 cuda-nsight-systems-12-1 && \ - apt-get -y clean + apt-get -y clean && \ + update-alternatives --set c++ /usr/bin/clang++ && \ + clang++ --version RUN chgrp -R 0 /opt/conda && \ chmod -R a+w /opt/conda && \ From d72544dcb2a4e9b19121dad83e238326d040efb5 Mon Sep 17 00:00:00 2001 From: Antoni Viros i Martin Date: Wed, 25 Oct 2023 13:43:01 -0400 Subject: [PATCH 4/6] set clang default --- nightly-pytorch-compile-clang/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/nightly-pytorch-compile-clang/Dockerfile b/nightly-pytorch-compile-clang/Dockerfile index d0a7f21..ff05288 100644 --- a/nightly-pytorch-compile-clang/Dockerfile +++ b/nightly-pytorch-compile-clang/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get -y -o Acquire::Max-FutureTime=86400 update && \ apt-get -y -o Acquire::Max-FutureTime=86400 update && \ apt-get install -y clang cuda-compiler-12-1 cuda-nsight-systems-12-1 && \ apt-get -y clean && \ + update-alternatives --set cc /usr/bin/clang && \ update-alternatives --set c++ /usr/bin/clang++ && \ clang++ --version From 87f3da4dff7f4d61f82075461d8eb15243e4574c Mon Sep 17 00:00:00 2001 From: Antoni Viros i Martin Date: Wed, 25 Oct 2023 13:45:39 -0400 Subject: [PATCH 5/6] set clang default --- nightly-pytorch-compile-clang/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nightly-pytorch-compile-clang/Dockerfile b/nightly-pytorch-compile-clang/Dockerfile index ff05288..04dfeca 100644 --- a/nightly-pytorch-compile-clang/Dockerfile +++ b/nightly-pytorch-compile-clang/Dockerfile @@ -16,7 +16,8 @@ RUN apt-get -y -o Acquire::Max-FutureTime=86400 update && \ apt-get -y clean && \ update-alternatives --set cc /usr/bin/clang && \ update-alternatives --set c++ /usr/bin/clang++ && \ - clang++ --version + whereis clang && \ + whereis clang++ RUN chgrp -R 0 /opt/conda && \ chmod -R a+w /opt/conda && \ From f16c40444ec5364e3addaaa8fee8067edab419b5 Mon Sep 17 00:00:00 2001 From: Antoni Viros i Martin Date: Wed, 25 Oct 2023 13:47:45 -0400 Subject: [PATCH 6/6] set clang default --- nightly-pytorch-compile-clang/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nightly-pytorch-compile-clang/Dockerfile b/nightly-pytorch-compile-clang/Dockerfile index 04dfeca..9a0c324 100644 --- a/nightly-pytorch-compile-clang/Dockerfile +++ b/nightly-pytorch-compile-clang/Dockerfile @@ -15,9 +15,7 @@ RUN apt-get -y -o Acquire::Max-FutureTime=86400 update && \ apt-get install -y clang cuda-compiler-12-1 cuda-nsight-systems-12-1 && \ apt-get -y clean && \ update-alternatives --set cc /usr/bin/clang && \ - update-alternatives --set c++ /usr/bin/clang++ && \ - whereis clang && \ - whereis clang++ + update-alternatives --set c++ /usr/bin/clang++ RUN chgrp -R 0 /opt/conda && \ chmod -R a+w /opt/conda && \