From 9aeed423da9da11756f959196594921e03011ec3 Mon Sep 17 00:00:00 2001 From: Aman Surkar <99606590+Aman-Surkar@users.noreply.github.com> Date: Fri, 3 May 2024 12:25:50 +0530 Subject: [PATCH 1/3] Updated README.md --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 11dc0dee..040be443 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@

[![Installation Options](https://img.shields.io/badge/Install%20with-conda%20%7C%20pip-brightgreen)](#installing-the-open-ce-build-tools) -[![Python Support](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C3.10-blue.svg)](#requirements) -[![Cuda Support](https://img.shields.io/badge/cuda-11.2%20%7C%2011.8%20-blue)](doc/README.cuda_support.md) +[![Python Support](https://img.shields.io/badge/python-3.10%20%7C%203.11-blue.svg)](#requirements) +[![Cuda Support](https://img.shields.io/badge/cuda-11.8%20%7C%2012.2-blue)](doc/README.cuda_support.md) [![Builder Unit Tests](https://github.com/open-ce/open-ce/workflows/Open-CE%20Builder%20Unit%20Tests/badge.svg)](https://github.com/open-ce/open-ce-builder/actions?query=workflow%3A%22Open-CE+Builder+Unit+Tests%22+branch%3Amain) [![Builder Unit Test Coverage](https://codecov.io/gh/open-ce/open-ce-builder/branch/main/graph/badge.svg)](https://codecov.io/gh/open-ce/open-ce-builder) @@ -77,6 +77,7 @@ pip install -e . | 1.8.1 | 12.0.2 | | 1.9.4 | 12.0.3 | | 1.10.0 | 13.0.0 | +| 1.11.0 | 13.0.0 | ### Building a Collection of Packages To build an entire integrated and functional conda channel using Open-CE, start by installing the needed tools in the [Requirements](#requirements) section above. @@ -102,18 +103,18 @@ open-ce build env opence-env A specific version of an environment file from the open-ce repo can be built using the `--git_tag` flag. -The following commands will build version 1.1.4 of the open-ce environment file provided within the open-ce [repo](https://github.com/open-ce/open-ce): +The following commands will build version 1.11.0 of the open-ce environment file provided within the open-ce [repo](https://github.com/open-ce/open-ce): ```bash # Build packages -open-ce build env --git_tag open-ce-v1.1.4 opence-env +open-ce build env --git_tag open-ce-v1.11.0 opence-env ``` -The following commands will use the `opence-env.yaml` Open-CE environment file from a specific Open-CE release to build all of the Open-CE packages for Python 3.9, 3.10 and 3.11, including only CUDA builds. The commands should be run from within the same directory that contains `local_files`. +The following commands will use the `opence-env.yaml` Open-CE environment file from a specific Open-CE release to build all of the Open-CE packages for Python 3.10 and 3.11, including only CUDA builds. The commands should be run from within the same directory that contains `local_files`. ```bash # Build packages -open-ce build env --python_versions 3.9,3.10,3.11 --build_types cuda opence-env +open-ce build env --python_versions 3.10,3.11 --build_types cuda opence-env ``` Note that having _conda-forge_ in your channel list may sometime cause conflicts or unexpected errors due to dependencies' versions mismatch. So, it is recommended to avoid mixing the channels during the build as well as at runtime. From 6d50f1d5663e8cc052ef43ab8fe0ea1cb3186f8a Mon Sep 17 00:00:00 2001 From: Aman Surkar Date: Fri, 3 May 2024 12:18:45 +0000 Subject: [PATCH 2/3] Added env variable for openssl --- open_ce/images/builder/Dockerfile | 2 ++ open_ce/images/builder/Dockerfile-p10 | 2 ++ open_ce/images/builder/Dockerfile-s390x | 1 + 3 files changed, 5 insertions(+) diff --git a/open_ce/images/builder/Dockerfile b/open_ce/images/builder/Dockerfile index 618fa586..edd5b553 100644 --- a/open_ce/images/builder/Dockerfile +++ b/open_ce/images/builder/Dockerfile @@ -5,6 +5,7 @@ ENV PATH=$CONDA_HOME/bin:$PATH ENV OPEN_CE_CONDA_BUILD=3.22.0 ENV OPEN_CE_CONDA=4.14 +ENV OPENSSL_VER=3.* ENV CICD_GROUP=cicd ARG GROUP_ID=1500 @@ -32,6 +33,7 @@ RUN export ARCH="$(uname -m)" && \ $CONDA_HOME/bin/conda config --system --set auto_update_conda false && \ $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \ $CONDA_HOME/bin/conda --version && \ + $CONDA_HOME/bin/conda install openssl=3 && \ mkdir -p $CONDA_HOME/conda-bld && \ mkdir -p $HOME/.cache && \ echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \ diff --git a/open_ce/images/builder/Dockerfile-p10 b/open_ce/images/builder/Dockerfile-p10 index 2495fc3f..cbb68233 100644 --- a/open_ce/images/builder/Dockerfile-p10 +++ b/open_ce/images/builder/Dockerfile-p10 @@ -5,6 +5,7 @@ ENV PATH=$CONDA_HOME/bin:$PATH ENV OPEN_CE_CONDA_BUILD=3.22.0 ENV OPEN_CE_CONDA=4.14 +ENV OPENSSL_VER=3.* ENV CICD_GROUP=cicd ARG GROUP_ID=1500 @@ -35,6 +36,7 @@ RUN export ARCH="$(uname -m)" && \ $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \ $CONDA_HOME/bin/conda config --system --add create_default_packages openssl=${OPENSSL_VER} && \ $CONDA_HOME/bin/conda --version && \ + $CONDA_HOME/bin/conda install openssl=3 && \ mkdir -p $CONDA_HOME/conda-bld && \ mkdir -p $HOME/.cache && \ echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \ diff --git a/open_ce/images/builder/Dockerfile-s390x b/open_ce/images/builder/Dockerfile-s390x index 407be91f..d645de82 100644 --- a/open_ce/images/builder/Dockerfile-s390x +++ b/open_ce/images/builder/Dockerfile-s390x @@ -34,6 +34,7 @@ RUN export ARCH="$(uname -m)" && \ $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \ $CONDA_HOME/bin/conda config --system --add create_default_packages openssl=${OPENSSL_VER} && \ $CONDA_HOME/bin/conda --version && \ + $CONDA_HOME/bin/conda install openssl=3 && \ mkdir -p $CONDA_HOME/conda-bld && \ mkdir -p $HOME/.cache && \ echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \ From 3840b7493fa95c747c74f1025ec85cb24cb4313c Mon Sep 17 00:00:00 2001 From: Aman Surkar Date: Fri, 3 May 2024 12:19:57 +0000 Subject: [PATCH 3/3] Added env variable for openssl --- open_ce/images/builder-cuda/Dockerfile.cuda-12.2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/open_ce/images/builder-cuda/Dockerfile.cuda-12.2 b/open_ce/images/builder-cuda/Dockerfile.cuda-12.2 index e21a1cb1..93f6e75e 100644 --- a/open_ce/images/builder-cuda/Dockerfile.cuda-12.2 +++ b/open_ce/images/builder-cuda/Dockerfile.cuda-12.2 @@ -6,6 +6,7 @@ ENV CUDA_HOME=/usr/local/cuda ENV OPEN_CE_CONDA_BUILD=3.22.0 ENV OPEN_CE_CONDA=4.14 +ENV OPENSSL_VER=3.* ENV CICD_GROUP=cicd ARG GROUP_ID=1500 @@ -36,6 +37,7 @@ RUN export ARCH="$(uname -m)" && \ $CONDA_HOME/bin/conda config --system --set auto_update_conda false && \ $CONDA_HOME/bin/conda config --system --set notify_outdated_conda false && \ $CONDA_HOME/bin/conda --version && \ + $CONDA_HOME/bin/conda install openssl=3 && \ mkdir -p $CONDA_HOME/conda-bld && \ mkdir -p $HOME/.cache && \ echo "export PYTHONPATH=${PYTHONPATH}:$HOME/open_ce" >> ${HOME}/.bashrc && \