Skip to content

Commit b22742b

Browse files
brobeybrobey
committed
Updating containers
1 parent 35abf5e commit b22742b

File tree

6 files changed

+182
-28
lines changed

6 files changed

+182
-28
lines changed

‎Dockerfile.Ubuntu18.04‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ USER chapter5
9595
ENV PATH=${PATH}:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin/x86_64
9696
ENV PATH=/usr/local/cuda-10.2/bin:/usr/local/cuda-10.2/NsightCompute-2019.1${PATH:+:${PATH}}
9797
ENV LD_LIBRARY_PATH=/usr/local/cuda-10.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
98-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/inteloneapi/compiler/2021.1-beta04/linux/compiler/lib/intel64_lin:/opt/intel/inteloneapi/compiler/2021.1-beta04/linux/lib
98+
ENV PATH=${PATH}:/opt/intel/oneapi/advisor/2021.1-beta08/bin64
99+
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/oneapi/compiler/2021.1-beta08/linux/compiler/lib/intel64_lin
100+
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/oneapi/compiler/2021.1-beta08/linux/lib
99101

100102
RUN git clone --recursive https://github.com/essentialsofparallelcomputing/Chapter5.git
101103

‎Dockerfile.Ubuntu20.04‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ USER chapter5
8787
ENV PATH=${PATH}:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin/x86_64
8888
ENV PATH=/usr/local/cuda-10.2/bin:/usr/local/cuda-10.2/NsightCompute-2019.1${PATH:+:${PATH}}
8989
ENV LD_LIBRARY_PATH=/usr/local/cuda-10.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
90-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/inteloneapi/compiler/2021.1-beta04/linux/compiler/lib/intel64_lin:/opt/intel/inteloneapi/compiler/2021.1-beta04/linux/lib
90+
ENV PATH=${PATH}:/opt/intel/oneapi/advisor/2021.1-beta08/bin64
91+
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/oneapi/compiler/2021.1-beta08/linux/compiler/lib/intel64_lin
92+
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/oneapi/compiler/2021.1-beta08/linux/lib
9193

9294
RUN git clone --recursive https://github.com/essentialsofparallelcomputing/Chapter5.git
9395

‎Dockerfile.debian‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ USER chapter5
8787
ENV PATH=${PATH}:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin/x86_64
8888
ENV PATH=/usr/local/cuda-10.2/bin:/usr/local/cuda-10.2/NsightCompute-2019.1${PATH:+:${PATH}}
8989
ENV LD_LIBRARY_PATH=/usr/local/cuda-10.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
90-
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/inteloneapi/compiler/2021.1-beta04/linux/compiler/lib/intel64_lin:/opt/intel/inteloneapi/compiler/2021.1-beta04/linux/lib
90+
ENV PATH=${PATH}:/opt/intel/oneapi/advisor/2021.1-beta08/bin64
91+
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/oneapi/compiler/2021.1-beta08/linux/compiler/lib/intel64_lin
92+
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/oneapi/compiler/2021.1-beta08/linux/lib
9193

9294
RUN git clone --recursive https://github.com/essentialsofparallelcomputing/Chapter5.git
9395

‎README.virtualbox‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,12 @@ sudo -qq apt-get update && \
3636
sudo -qq apt-get install -y cmake git vim gcc g++ gfortran software-properties-common \
3737
python3 wget gnupg-agent \
3838
mpich libmpich-dev \
39-
openmpi-bin openmpi-doc libopenmpi-dev && \
40-
sudo apt-get clean && \
41-
sudo rm -rf /var/lib/apt/lists/*
39+
openmpi-bin openmpi-doc libopenmpi-dev
4240

4341
# Installing latest GCC compiler (version 8) for best vectorization
4442
sudo apt-get -qq update && \
4543
sudo apt-get -qq install -y gcc-8 g++-8 gfortran-8 \
46-
gcc-9 g++-9 gfortran-9 \
47-
gcc-10 g++-10 gfortran-10 && \
48-
sudo apt-get clean && \
49-
sudo rm -rf /var/lib/apt/lists/*
44+
gcc-10 g++-10 gfortran-10
5045

5146
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 90 \
5247
--slave /usr/bin/g++ g++ /usr/bin/g++-8 \
@@ -76,15 +71,11 @@ sudo -qq apt-get install -y \
7671
intel-oneapi-dev-utilities \
7772
intel-oneapi-icc \
7873
intel-oneapi-ifort \
79-
intel-opencl && \
80-
sudo apt-get clean && \
81-
sudo rm -rf /var/lib/apt/lists/*
74+
intel-opencl
8275

8376
# Generic OpenCL Loader
8477
sudo apt-get update && \
85-
sudo apt-get install -y clinfo ocl-icd-libopencl1 ocl-icd-* opencl-headers && \
86-
sudo apt-get clean && \
87-
sudo rm -rf /var/lib/apt/lists/*
78+
sudo apt-get install -y clinfo ocl-icd-libopencl1 ocl-icd-* opencl-headers
8879

8980
# Nvidia GPU software for computation
9081
sudo wget -q https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_10.2.89-1_amd64.deb
@@ -93,28 +84,22 @@ sudo RUN dpkg -i cuda-repo-ubuntu1804_10.2.89-1_amd64.deb
9384

9485
sudo apt-get -qq update && \
9586
sudo apt-get -qq install -y cuda-toolkit-10-2 cuda-tools-10-2 cuda-compiler-10-2 \
96-
cuda-libraries-10-2 cuda-libraries-dev-10-2 libnvidia-compute-450 && \
97-
sudo apt-get clean && \
98-
sudo rm -rf /var/lib/apt/lists/*
87+
cuda-libraries-10-2 cuda-libraries-dev-10-2 libnvidia-compute-450
9988

10089
# ROCm software installation
10190
sudo apt-get -qq update && \
102-
sudo apt-get -qq install -y libnuma-dev && \
103-
sudo apt-get clean && \
104-
sudo rm -rf /var/lib/apt/lists/*
91+
sudo apt-get -qq install -y libnuma-dev
10592

10693
sudo wget -qO - http://repo.radeon.com/rocm/apt/debian/rocm.gpg.key | apt-key add -
10794
sudo echo 'deb [arch=amd64] http://repo.radeon.com/rocm/apt/debian/ xenial main' >> /etc/apt/sources.list.d/r
10895
sudo apt-get -qq update && \
109-
sudo apt-get -qq install -y rocm-opencl-dev rocm-dkms && \
110-
sudo apt-get clean && \
111-
sudo rm -rf /var/lib/apt/lists/*
96+
sudo apt-get -qq install -y rocm-opencl-dev rocm-dkms
11297

11398
# Vendor OpenCL
11499
sudo apt-get -qq update && \
115-
sudo apt-get -qq install -y mesa-opencl-icd && \
116-
sudo apt-get clean && \
117-
sudo rm -rf /var/lib/apt/lists/*
100+
sudo apt-get -qq install -y mesa-opencl-icd
101+
102+
sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
118103

119104
# If Software updater prompts, install updated software --> wait ....
120105

‎Setup.Ubuntu18.04‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
#!/bin/sh
2+
# Sets up Ubuntu 18.04 from bare-bones installation
3+
# Comment out what you don't need or run line-by-line, manually
4+
export DEBIAN_FRONTEND=noninteractive
5+
sudo apt-get -qq update && \
6+
sudo apt-get -qq install -y cmake make git vim gcc g++ gfortran software-properties-common \
7+
python3 wget gnupg-agent \
8+
mpich libmpich-dev \
9+
openmpi-bin openmpi-doc libopenmpi-dev
10+
11+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
12+
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
13+
sudo apt-get -qq update && \
14+
apt-get -qq install -y gcc-8 g++-8 gfortran-8 \
15+
apt-get -qq install -y gcc-9 g++-9 gfortran-9 \
16+
apt-get -qq install -y gcc-10 g++-10 gfortran-10
17+
18+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 \
19+
--slave /usr/bin/g++ g++ /usr/bin/g++-7 \
20+
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-7 \
21+
--slave /usr/bin/gcov gcov /usr/bin/gcov-7
22+
23+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 90 \
24+
--slave /usr/bin/g++ g++ /usr/bin/g++-8 \
25+
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-8 \
26+
--slave /usr/bin/gcov gcov /usr/bin/gcov-8
27+
28+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 80 \
29+
--slave /usr/bin/g++ g++ /usr/bin/g++-9 \
30+
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-9 \
31+
--slave /usr/bin/gcov gcov /usr/bin/gcov-9
32+
33+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 70 \
34+
--slave /usr/bin/g++ g++ /usr/bin/g++-10 \
35+
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-10 \
36+
--slave /usr/bin/gcov gcov /usr/bin/gcov-10
37+
38+
sudo chmod u+s /usr/bin/update-alternatives
39+
40+
# Intel graphics software for computation
41+
sudo wget -q https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
42+
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
43+
sudo rm -f GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
44+
sudo echo "deb https://apt.repos.intel.com/oneapi all main" >> /etc/apt/sources.list.d/oneAPI.list
45+
sudo echo "deb [trusted=yes arch=amd64] https://repositories.intel.com/graphics/ubuntu bionic main" >> /etc/apt/sources.list.d/intel-graphics.list
46+
47+
sudo apt-get -qq update && \
48+
apt-get -qq install -y \
49+
intel-basekit-getting-started \
50+
intel-hpckit-getting-started \
51+
intel-oneapi-common-vars \
52+
intel-oneapi-common-licensing \
53+
intel-oneapi-dev-utilities \
54+
intel-oneapi-icc \
55+
intel-oneapi-ifort \
56+
intel-opencl
57+
58+
# Generic OpenCL Loader
59+
sudo apt-get -qq update && \
60+
apt-get -qq install -y clinfo ocl-icd-libopencl1 ocl-icd-* opencl-headers
61+
#apt-get -qq install -y clinfo ocl-icd-libopencl1 ocl-icd opencl-headers && \
62+
63+
# Nvidia GPU software for computation
64+
sudo wget -q https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_10.2.89-1_amd64.deb
65+
sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
66+
sudo dpkg -i cuda-repo-ubuntu1804_10.2.89-1_amd64.deb
67+
sudo apt-get -qq update && \
68+
apt-get -qq install -y cuda-toolkit-10-2 cuda-tools-10-2 cuda-compiler-10-2 \
69+
cuda-libraries-10-2 cuda-libraries-dev-10-2 libnvidia-compute-450
70+
71+
# ROCm software installation
72+
sudo apt-get -qq update && \
73+
apt-get -qq install -y libnuma-dev
74+
75+
sudo wget -qO - http://repo.radeon.com/rocm/apt/debian/rocm.gpg.key | apt-key add -
76+
sudo echo 'deb [arch=amd64] http://repo.radeon.com/rocm/apt/debian/ xenial main' >> /etc/apt/sources.list.d/rocm.list
77+
sudo apt-get -qq update && \
78+
apt-get -qq install -y rocm-opencl-dev rocm-dkms
79+
80+
# Vendor OpenCL
81+
sudo apt-get -qq install -y mesa-opencl-icd
82+
83+
sudo apt-get clean && rm -rf /var/lib/apt/lists/*
84+
85+
make clean
86+
make

‎Setup.Ubuntu20.04‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#!/bin/sh
2+
# Sets up Ubuntu 20.04 from bare-bones installation
3+
# Comment out what you don't need or run line-by-line, manually
4+
export DEBIAN_FRONTEND=noninteractive
5+
sudo apt-get -qq update && \
6+
sudo apt-get -qq install -y cmake make git vim gcc g++ gfortran software-properties-common \
7+
python3 wget gnupg-agent \
8+
mpich libmpich-dev \
9+
openmpi-bin openmpi-doc libopenmpi-dev
10+
11+
sudo apt-get -qq install -y gcc-8 g++-8 gfortran-8 \
12+
gcc-10 g++-10 gfortran-10
13+
14+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 90 \
15+
--slave /usr/bin/g++ g++ /usr/bin/g++-8 \
16+
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-8 \
17+
--slave /usr/bin/gcov gcov /usr/bin/gcov-8
18+
19+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 80 \
20+
--slave /usr/bin/g++ g++ /usr/bin/g++-9 \
21+
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-9 \
22+
--slave /usr/bin/gcov gcov /usr/bin/gcov-9
23+
24+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 70 \
25+
--slave /usr/bin/g++ g++ /usr/bin/g++-10 \
26+
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-10 \
27+
--slave /usr/bin/gcov gcov /usr/bin/gcov-10
28+
29+
sudo chmod u+s /usr/bin/update-alternatives
30+
31+
# Intel graphics software for computation
32+
sudo wget -q https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
33+
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
34+
sudo rm -f GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
35+
sudo echo "deb https://apt.repos.intel.com/oneapi all main" >> /etc/apt/sources.list.d/oneAPI.list
36+
sudo echo "deb [trusted=yes arch=amd64] https://repositories.intel.com/graphics/ubuntu bionic main" >> /etc/apt/sources.list.d/intel-graphics.list
37+
38+
sudo apt-get -qq update && \
39+
apt-get -qq install -y \
40+
intel-basekit-getting-started \
41+
intel-hpckit-getting-started \
42+
intel-oneapi-common-vars \
43+
intel-oneapi-common-licensing \
44+
intel-oneapi-dev-utilities \
45+
intel-oneapi-icc \
46+
intel-oneapi-ifort \
47+
intel-opencl
48+
49+
# Generic OpenCL Loader
50+
sudo apt-get -qq update && \
51+
apt-get -qq install -y clinfo ocl-icd-libopencl1 ocl-icd-* opencl-headers
52+
#apt-get -qq install -y clinfo ocl-icd-libopencl1 ocl-icd opencl-headers && \
53+
54+
# Nvidia GPU software for computation
55+
sudo wget -q https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_10.2.89-1_amd64.deb
56+
sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
57+
sudo dpkg -i cuda-repo-ubuntu1804_10.2.89-1_amd64.deb
58+
sudo apt-get -qq update && \
59+
apt-get -qq install -y cuda-toolkit-10-2 cuda-tools-10-2 cuda-compiler-10-2 \
60+
cuda-libraries-10-2 cuda-libraries-dev-10-2 libnvidia-compute-450
61+
62+
# ROCm software installation
63+
sudo apt-get -qq update && \
64+
apt-get -qq install -y libnuma-dev
65+
66+
sudo wget -qO - http://repo.radeon.com/rocm/apt/debian/rocm.gpg.key | apt-key add -
67+
sudo echo 'deb [arch=amd64] http://repo.radeon.com/rocm/apt/debian/ xenial main' >> /etc/apt/sources.list.d/rocm.list
68+
sudo apt-get -qq update && \
69+
apt-get -qq install -y rocm-opencl-dev rocm-dkms
70+
71+
# Vendor OpenCL
72+
sudo apt-get -qq install -y mesa-opencl-icd
73+
74+
sudo apt-get clean && rm -rf /var/lib/apt/lists/*
75+
76+
make clean
77+
make

0 commit comments

Comments
 (0)