docker: switch to intelpython for icc/icx build

devitocodes · Jul 26, 2023 · 49cfd81 · 49cfd81
1 parent 65dc7d8
commit 49cfd81
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/pytest-core-nompi.yml b/.github/workflows/pytest-core-nompi.yml
@@ -163,6 +163,7 @@ jobs:
     - name: Test with pytest
       run: |
         ${{ env.RUN_CMD }} ${{ matrix.arch }} --version
+        ${{ env.RUN_CMD }} python3 --version
         ${{ env.RUN_CMD }} pytest -k "${{ matrix.test-set }}" -m "not parallel" --cov --cov-config=.coveragerc --cov-report=xml ${{ env.TESTS }}
 
     - name: Upload coverage to Codecov

diff --git a/docker/Dockerfile.cpu b/docker/Dockerfile.cpu
@@ -64,6 +64,7 @@ FROM base as oneapi
 # https://www.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-using-package-managers/apt.html#apt
 RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor > /usr/share/keyrings/oneapi-archive-keyring.gpg
 RUN echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" > /etc/apt/sources.list.d/oneAPI.list
+RUN echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/intelpython binary/" > /etc/apt/sources.list.d/intelpython.list
 
 # Set en vars by hand since we can't use entrypoint for intermediate image
 ENV I_ICC_ROOT=/opt/intel/oneapi/compiler/latest/
@@ -72,6 +73,11 @@ ENV PATH $I_MPI_ROOT/libfabric/bin:$I_MPI_ROOT/bin:$I_ICC_ROOT/linux/bin/intel64
 ENV LD_LIBRARY_PATH $I_MPI_ROOT/libfabric/lib:$I_MPI_ROOT/lib/release:$I_MPI_ROOT/lib:$I_ICC_ROOT/linux/lib:$I_ICC_ROOT/linux/lib/x64:$I_ICC_ROOT/linux/compiler/lib/intel64_lin:${LD_LIBRARY_PATH}
 ENV FI_PROVIDER_PATH $I_MPI_ROOT/libfabric/lib/prov:/usr/lib64/libfabric:${LD_LIBRARY_PATH}
 
+# Install intelpython
+RUN wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/03aae3a8-623a-47cf-9655-5dd8fcf86430/l_pythoni39_oneapi_p_2023.2.0.49422.sh && \
+    ./l_pythoni39_oneapi_p_2023.2.0.49422.sh -r yes -a -s --eula accept
+ENV PATH /opt/intel/oneapi/intelpython/python3.9/bin:${PATH}
+
 ##############################################################
 # ICC image
 # This is a legacy setup that is not built anymore but kept for reference