Skip to content

Commit 41986de

Browse files
mrogowskimrogowski
authored
Use venv (#32)
Use python venv
1 parent b41d57b commit 41986de

File tree

9 files changed

+33
-20
lines changed

9 files changed

+33
-20
lines changed

‎.github/workflows/containers.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
- name: Build Docker container
2626
run: docker build -t local docker/${{ matrix.shmem }}/
2727
- name: run shmem4py test-1
28-
run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "pip install . && make test-1 opt=-v"
28+
run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /venv/bin/activate && pip install . && make test-1 opt=-v"
2929
- name: run shmem4py test-2
30-
run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "pip install . && make test-2 opt=-v"
30+
run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "source /venv/bin/activate && pip install . && make test-2 opt=-v"
3131
- name: run shmem4py demo-test-1
32-
run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "pip install . && cd demo && make test-1 opt=-v"
32+
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"
3333
- name: run shmem4py demo-test-2
34-
run: docker run -v $PWD:/repo -w/repo local /bin/bash -c "pip install . && cd demo && make test-2 opt=-v"
34+
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"

‎docker/oshmem_fedora/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM fedora:latest
2+
SHELL ["/bin/bash", "-c"]
23

34
ENV INSTALL_DIR=/home/shmem
45
RUN mkdir /home/shmem
@@ -29,5 +30,5 @@ ENV PATH=/home/shmem/openmpi-4.1.6/install/bin:"${PATH}" \
2930
OMPI_ALLOW_RUN_AS_ROOT=1 \
3031
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
3132

32-
RUN ln -s /usr/bin/python3 /usr/bin/python
33-
RUN python -m pip install setuptools cffi numpy
33+
RUN python3 -m venv /venv
34+
RUN source /venv/bin/activate && pip install setuptools cffi numpy

‎docker/oshmem_ubuntu/Dockerfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
FROM ubuntu:latest
2+
SHELL ["/bin/bash", "-c"]
3+
24
ENV INSTALL_DIR=/home/shmem
35
RUN mkdir /home/shmem
46
ENV DEBIAN_FRONTEND=noninteractive
@@ -10,7 +12,7 @@ RUN apt-get update -y && apt-get install -y \
1012
automake \
1113
libtool \
1214
wget \
13-
python3 python3-pip python-is-python3
15+
python3 python3-pip python-is-python3 python3-venv
1416

1517
RUN cd $INSTALL_DIR && \
1618
wget https://github.com/openucx/ucx/archive/refs/tags/v1.15.0.tar.gz && \
@@ -33,4 +35,5 @@ ENV PATH=/home/shmem/openmpi-4.1.6/install/bin:"${PATH}" \
3335
OMPI_ALLOW_RUN_AS_ROOT=1 \
3436
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
3537

36-
RUN python -m pip install numpy cffi
38+
RUN python3 -m venv /venv
39+
RUN source /venv/bin/activate && pip install numpy cffi

‎docker/oshmpi_fedora/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM fedora:latest
2+
SHELL ["/bin/bash", "-c"]
23

34
ENV INSTALL_DIR=/home/shmem
45
RUN mkdir /home/shmem
@@ -16,6 +17,6 @@ RUN cd $INSTALL_DIR
1617
make -j && make install
1718

1819
ENV PATH="/home/shmem/oshmpi/install/bin/:/usr/lib64/mpich/bin/:${PATH}"
19-
RUN ln -s /usr/bin/python3 /usr/bin/python
20-
RUN python -m pip install numpy cffi
20+
RUN python3 -m venv /venv
21+
RUN source /venv/bin/activate && pip install numpy cffi
2122
ENV PSM3_DEVICES="self,shm"

‎docker/oshmpi_ubuntu/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM ubuntu:latest
2+
SHELL ["/bin/bash", "-c"]
23

34
ENV INSTALL_DIR=/home/shmem
45
RUN mkdir /home/shmem
@@ -12,7 +13,7 @@ RUN apt-get update -y && apt-get install -y \
1213
automake \
1314
libtool \
1415
mpich \
15-
python3 python3-pip python-is-python3
16+
python3 python3-pip python-is-python3 python3-venv
1617

1718
RUN cd $INSTALL_DIR && \
1819
git clone https://github.com/pmodels/oshmpi --recurse-submodules && \
@@ -22,4 +23,5 @@ RUN cd $INSTALL_DIR
2223
make -j && make install
2324

2425
ENV PATH="/home/shmem/oshmpi/install/bin/:${PATH}"
25-
RUN python -m pip install numpy cffi
26+
RUN python3 -m venv /venv
27+
RUN source /venv/bin/activate && pip install numpy cffi

‎docker/osss_fedora/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM fedora:latest
2+
SHELL ["/bin/bash", "-c"]
23

34
ENV INSTALL_DIR=/home/shmem
45
RUN mkdir /home/shmem
@@ -36,5 +37,5 @@ ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/home/shmem/openmpi-4.1.6/install/bin
3637
OMPI_ALLOW_RUN_AS_ROOT=1 \
3738
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
3839

39-
RUN ln -s /usr/bin/python3 /usr/bin/python
40-
RUN python -m pip install setuptools cffi numpy
40+
RUN python3 -m venv /venv
41+
RUN source /venv/bin/activate && pip install setuptools cffi numpy

‎docker/osss_ubuntu/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM ubuntu:latest
2+
SHELL ["/bin/bash", "-c"]
23

34
ENV INSTALL_DIR=/home/shmem
45
RUN mkdir /home/shmem
@@ -13,7 +14,7 @@ RUN apt-get update -y && apt-get install -y \
1314
libtool \
1415
pkg-config \
1516
libpmix-bin libpmix-dev \
16-
python3 python3-pip python-is-python3
17+
python3 python3-pip python-is-python3 python3-venv
1718

1819
RUN cd $INSTALL_DIR && \
1920
wget https://github.com/openucx/ucx/archive/refs/tags/v1.15.0.tar.gz && \
@@ -43,4 +44,5 @@ ENV PATH=$INSTALL_DIR/osss-ucx/install/bin:/home/shmem/openmpi-4.1.6/install/bin
4344
OMPI_ALLOW_RUN_AS_ROOT=1 \
4445
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
4546

46-
RUN python -m pip install setuptools cffi numpy
47+
RUN python3 -m venv /venv
48+
RUN source /venv/bin/activate && pip install setuptools cffi numpy

‎docker/sos_fedora/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# adapted from https://github.com/Sandia-OpenSHMEM/SOS/blob/master/scripts/docker/Dockerfile
22

33
FROM fedora:latest
4+
SHELL ["/bin/bash", "-c"]
45

56
ENV INSTALL_DIR=/home/shmem
67
RUN mkdir /home/shmem
@@ -33,5 +34,5 @@ RUN cd $INSTALL_DIR
3334
make check TESTS= -j
3435

3536
ENV PATH="/home/shmem/SOS/install/bin:/usr/lib64/mpich/bin:${PATH}"
36-
RUN ln -s /usr/bin/python3 /usr/bin/python
37-
RUN python -m pip install numpy cffi setuptools
37+
RUN python3 -m venv /venv
38+
RUN source /venv/bin/activate && pip install numpy cffi setuptools

‎docker/sos_ubuntu/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# adapted from https://github.com/Sandia-OpenSHMEM/SOS/blob/master/scripts/docker/Dockerfile
22

33
FROM ubuntu:latest
4+
SHELL ["/bin/bash", "-c"]
45

56
ENV INSTALL_DIR=/home/shmem
67
RUN mkdir /home/shmem
@@ -19,7 +20,7 @@ RUN apt-get update -y && apt-get install -y \
1920
libhwloc-dev \
2021
libevent-dev \
2122
mpich \
22-
python3 python3-pip python-is-python3
23+
python3 python3-pip python-is-python3 python3-venv
2324

2425
# Build Libfabric
2526
RUN cd $INSTALL_DIR && \
@@ -41,4 +42,5 @@ RUN cd $INSTALL_DIR
4142
make check TESTS= -j
4243

4344
ENV PATH="/home/shmem/SOS/install/bin:${PATH}"
44-
RUN python -m pip install numpy cffi setuptools
45+
RUN python3 -m venv /venv
46+
RUN source /venv/bin/activate && pip install numpy cffi setuptools

0 commit comments

Comments
 (0)