Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Python version to 3.11 #76

Merged
merged 2 commits into from
Mar 14, 2023
+8 −6
Merged

update Python version to 3.11 #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0df15a0
update Python version
haobibo Mar 13, 2023
41fa91f
bugfix: R pkg install
haobibo Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker_atom/work/script-setup.sh
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ EOF
setup_conda_with_mamba() {
local PREFIX="${CONDA_PREFIX:-/opt/conda}"
mkdir -pv "${PREFIX}"
VERSION_PYTHON=${1:-"3.10"}; shift 1;
VERSION_PYTHON=${1:-"3.11"}; shift 1;
mamba install -y --root-prefix="${PREFIX}" --prefix="${PREFIX}" -c "conda-forge" conda pip python="${VERSION_PYTHON}"
setup_conda_postprocess
}
@@ -116,7 +116,7 @@ setup_java_base() {
URL_OPENJDK=${JDK_URL_MSFT}
else
echo "ORCA download URL ref: ${JDK_URL_ORCA}"
URL_OPENJDK="https://javadl.oracle.com/webapps/download/GetFile/1.8.0_351-b10/10e8cce67c7843478f41411b7003171c/linux-i586/jdk-8u351-linux-${ARCH}.tar.gz"
URL_OPENJDK="https://javadl.oracle.com/webapps/download/GetFile/1.8.0_361-b09/0ae14417abb444ebb02b9815e2103550/linux-i586/jdk-8u361-linux-${ARCH}.tar.gz"
fi

echo "Installing JDK version ${VER_JDK} from: ${URL_OPENJDK}" \
2 changes: 1 addition & 1 deletion docker_base/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ ARG BASE_IMG="atom"
FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
LABEL maintainer="haobibo@gmail.com"

ARG PYTHON_VERSION="3.10"
ARG PYTHON_VERSION="3.11"

ENV CONDA_PREFIX=/opt/conda
ENV PATH=$PATH:${CONDA_PREFIX}/bin
6 changes: 3 additions & 3 deletions docker_core/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -64,14 +64,14 @@ RUN source /opt/utils/script-utils.sh \
&& for profile in $(echo $ARG_PROFILE_PYTHON | tr "," "\n") ; do ( echo "Pip install for ${profile}" ; install_pip "/opt/utils/install_list_PY_${profile}.pip" ; ) ; done \
# Handle tensorflow installation 1.x/2.x, cpu/gpu: https://www.tensorflow.org/install/source#gpu
&& ( $(grep -q "tf" <<< "${ARG_PROFILE_PYTHON}") && ( \
TF=$( [ -x "$(command -v nvcc)" ] && echo "tensorflow-gpu" || echo "tensorflow") \
&& V=$($(grep -q "tf1" <<< "${ARG_PROFILE_PYTHON}") && echo "1" || echo "2" ) \
V=$($(grep -q "tf1" <<< "${ARG_PROFILE_PYTHON}") && echo "1" || echo "2" ) \
TF=$( [ "$V" == "1" ] && echo "tensorflow-gpu" || echo "tensorflow") \
&& pip install --pre -U "${TF}==${V}.*" \
) || echo "Skip tf install" ) \
# Handle pytorch installation 1.x only, cpu/gpu: https://pytorch.org/get-started/locally/
&& ( $(grep -q "torch" <<< "${ARG_PROFILE_PYTHON}") && ( \
CUDA_VER=$(echo "${CUDA_VERSION:0:4}" | sed 's/\.//' ) \
&& IDX=$( [ -x "$(command -v nvcc)" ] && echo "cu${CUDA_VER:-113}" || echo "cpu" ) \
&& IDX=$( [ -x "$(command -v nvcc)" ] && echo "cu${CUDA_VER:-116}" || echo "cpu" ) \
&& pip install --pre -U torch -f "https://download.pytorch.org/whl/${IDX}/torch_stable.html" \
) || echo "Skip pytorch install" ) \
# Handle paddle installation, cpu/gpu: https://www.paddlepaddle.org.cn/
2 changes: 2 additions & 0 deletions docker_core/work/install_list_R_base.apt
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@
r-base % CRAN R language base
r-base-dev % required when building and install some R libraries
libcurl4-openssl-dev % required when building R package curl
libfontconfig1-dev % required to build R package fontconfig
libfreetype6-dev % required to build R package freetype2
libxml2-dev % required to build R package xml2
libssl-dev % required to build R package openssl
libgit2-dev % required to build R package git2r