Use /venv

mpi4py · Apr 28, 2024 · 215cb51 · 215cb51
1 parent fac7eb8
commit 215cb51
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -25,10 +25,10 @@ jobs:
       - name: Build Docker container
         run: docker build -t local docker/${{ matrix.shmem }}/
       - name: run shmem4py test-1
-        run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /.venv/bin/activate && pip install . && make test-1 opt=-v"
+        run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /venv/bin/activate && pip install . && make test-1 opt=-v"
       - name: run shmem4py test-2
-        run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /.venv/bin/activate && pip install . && make test-2 opt=-v"
+        run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /venv/bin/activate && pip install . && make test-2 opt=-v"
       - name: run shmem4py demo-test-1
-        run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /.venv/bin/activate && pip install . && cd demo && make test-1 opt=-v"
+        run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /venv/bin/activate && pip install . && cd demo && make test-1 opt=-v"
       - name: run shmem4py demo-test-2
-        run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /.venv/bin/activate && pip install . && cd demo && make test-2 opt=-v"
+        run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /venv/bin/activate && pip install . && cd demo && make test-2 opt=-v"
diff --git a/docker/oshmem_fedora/Dockerfile b/docker/oshmem_fedora/Dockerfile
@@ -30,5 +30,5 @@ ENV PATH=/home/shmem/openmpi-4.1.6/install/bin:"${PATH}" \
     OMPI_ALLOW_RUN_AS_ROOT=1 \
     OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
-RUN python3 -m venv .venv
-RUN source /.venv/bin/activate &&  pip install setuptools cffi numpy
+RUN python3 -m venv /venv
+RUN source /venv/bin/activate &&  pip install setuptools cffi numpy
diff --git a/docker/oshmem_ubuntu/Dockerfile b/docker/oshmem_ubuntu/Dockerfile
@@ -35,5 +35,5 @@ ENV PATH=/home/shmem/openmpi-4.1.6/install/bin:"${PATH}" \
     OMPI_ALLOW_RUN_AS_ROOT=1 \
     OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
-RUN python3 -m venv .venv
-RUN source /.venv/bin/activate && pip install numpy cffi
+RUN python3 -m venv /venv
+RUN source /venv/bin/activate && pip install numpy cffi
diff --git a/docker/oshmpi_fedora/Dockerfile b/docker/oshmpi_fedora/Dockerfile
@@ -17,6 +17,6 @@ RUN cd $INSTALL_DIR
     make -j && make install
 
 ENV PATH="/home/shmem/oshmpi/install/bin/:/usr/lib64/mpich/bin/:${PATH}"
-RUN python3 -m venv .venv
-RUN source /.venv/bin/activate && pip install numpy cffi
+RUN python3 -m venv /venv
+RUN source /venv/bin/activate && pip install numpy cffi
 ENV PSM3_DEVICES="self,shm"
diff --git a/docker/oshmpi_ubuntu/Dockerfile b/docker/oshmpi_ubuntu/Dockerfile
@@ -23,5 +23,5 @@ RUN cd $INSTALL_DIR
     make -j && make install
 
 ENV PATH="/home/shmem/oshmpi/install/bin/:${PATH}"
-RUN python3 -m venv .venv
-RUN source /.venv/bin/activate && pip install numpy cffi
+RUN python3 -m venv /venv
+RUN source /venv/bin/activate && pip install numpy cffi
diff --git a/docker/osss_fedora/Dockerfile b/docker/osss_fedora/Dockerfile
@@ -37,5 +37,5 @@ ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/home/shmem/openmpi-4.1.6/install/bin
     OMPI_ALLOW_RUN_AS_ROOT=1 \
     OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
-RUN python3 -m venv .venv
-RUN source /.venv/bin/activate && pip install setuptools cffi numpy
+RUN python3 -m venv /venv
+RUN source /venv/bin/activate && pip install setuptools cffi numpy
diff --git a/docker/osss_ubuntu/Dockerfile b/docker/osss_ubuntu/Dockerfile
@@ -44,5 +44,5 @@ ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/home/shmem/openmpi-4.1.6/install/bin
     OMPI_ALLOW_RUN_AS_ROOT=1 \
     OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
-RUN python3 -m venv .venv
-RUN source /.venv/bin/activate && pip install setuptools cffi numpy
+RUN python3 -m venv /venv
+RUN source /venv/bin/activate && pip install setuptools cffi numpy
diff --git a/docker/sos_fedora/Dockerfile b/docker/sos_fedora/Dockerfile
@@ -34,5 +34,5 @@ RUN cd $INSTALL_DIR
     make check TESTS= -j
 
 ENV PATH="/home/shmem/SOS/install/bin:/usr/lib64/mpich/bin:${PATH}"
-RUN python3 -m venv .venv
-RUN source /.venv/bin/activate && pip install numpy cffi setuptools
+RUN python3 -m venv /venv
+RUN source /venv/bin/activate && pip install numpy cffi setuptools
diff --git a/docker/sos_ubuntu/Dockerfile b/docker/sos_ubuntu/Dockerfile
@@ -42,5 +42,5 @@ RUN cd $INSTALL_DIR
     make check TESTS= -j
 
 ENV PATH="/home/shmem/SOS/install/bin:${PATH}"
-RUN python3 -m venv .venv
-RUN source /.venv/bin/activate && pip install numpy cffi setuptools
+RUN python3 -m venv /venv
+RUN source /venv/bin/activate && pip install numpy cffi setuptools