resolved conflicts

Makefile

@@ -178,9 +178,14 @@ cuda-jupyter-datascience-ubi9-python-3.9: cuda-jupyter-minimal-ubi9-python-3.9
 cuda-jupyter-tensorflow-ubi9-python-3.9: cuda-jupyter-datascience-ubi9-python-3.9
 	$(call image,$@,jupyter/tensorflow/ubi9-python-3.9,$<)
 
+# Build and push jupyter-pytorch-ubi9-python-3.9 image to the registry
+.PHONY: cuda-jupyter-pytorch-ubi9-python-3.9
+cuda-jupyter-pytorch-ubi9-python-3.9: cuda-jupyter-datascience-ubi9-python-3.9
+	$(call image,$@,jupyter/pytorch/ubi9-python-3.9,$<)
+
 # Build and push jupyter-pytorch-ubi9-python-3.9 image to the registry
 .PHONY: jupyter-pytorch-ubi9-python-3.9
-jupyter-pytorch-ubi9-python-3.9: cuda-jupyter-datascience-ubi9-python-3.9
+jupyter-pytorch-ubi9-python-3.9: jupyter-datascience-ubi9-python-3.9
 	$(call image,$@,jupyter/pytorch/ubi9-python-3.9,$<)
 
 # Build and push jupyter-trustyai-ubi9-python-3.9 image to the registry

jupyter/datascience/ubi9-python-3.9/Dockerfile

@@ -18,9 +18,20 @@ COPY Pipfile.lock ./
 # Copy Elyra setup to utils so that it's sourced at startup
 COPY setup-elyra.sh ./utils/
 
+COPY centos-crb.repo /etc/yum.repos.d/centos-crb.repo
+COPY constraints.txt /etc/constraints.txt
+
+USER root
+RUN dnf install -y unixODBC-devel python3-devel openblas* openssl-devel && dnf clean all
+
+USER 1001
+
 RUN echo "Installing softwares and packages" && \
-    micropipenv install && \
-    rm -f ./Pipfile.lock
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y &&\
+    source "$HOME/.cargo/env" && \
+    GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true PIP_CONSTRAINT=/etc/constraints.txt micropipenv install && \
+    rm -f ./Pipfile.lock && \
+    rustup self uninstall -y
 
 COPY utils ./utils/
 
@@ -34,16 +45,17 @@ RUN dnf install -y jq unixODBC postgresql git-lfs libsndfile && dnf clean all &&
 RUN jupyter labextension disable "@jupyterlab/apputils-extension:announcements"
 
 # Install MongoDB Client, We need a special repo for MongoDB as they do their own distribution
-COPY mongodb-org-6.0.repo-x86_64 /etc/yum.repos.d/mongodb-org-6.0.repo
+#COPY mongodb-org-6.0.repo-x86_64 /etc/yum.repos.d/mongodb-org-6.0.repo
 
-RUN dnf install -y mongocli && dnf clean all && rm -rf /var/cache/yum
+#RUN dnf install -y mongocli 
+RUN dnf clean all && rm -rf /var/cache/yum
 
 # Install MSSQL Client, We need a special repo for MSSQL as they do their own distribution
-COPY mssql-2022.repo-x86_64 /etc/yum.repos.d/mssql-2022.repo
+#COPY mssql-2022.repo-x86_64 /etc/yum.repos.d/mssql-2022.repo
 
-RUN ACCEPT_EULA=Y dnf install -y mssql-tools18 unixODBC-devel && dnf clean all && rm -rf /var/cache/yum
+#RUN ACCEPT_EULA=Y dnf install -y mssql-tools18 unixODBC-devel && dnf clean all && rm -rf /var/cache/yum
 
-ENV PATH="$PATH:/opt/mssql-tools18/bin"
+#ENV PATH="$PATH:/opt/mssql-tools18/bin"
 
 # Other apps and tools installed as default user
 USER 1001

jupyter/datascience/ubi9-python-3.9/Pipfile

@@ -3,9 +3,18 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 name = "pypi"
 
+[[source]]
+url = "http://10.20.177.222:9000/"
+verify_ssl = false
+name = "localpi"
+
 [dev-packages]
 
 [packages]
+ray = {version = "2.7.0.*", index="localpi"}
+py-spy = {version = "0.3.14.*", index="localpi"}
+pyarrow = {version = "15.0.1.dev0+g5ce6ff434.d20240426", index="localpi"}
+
 # Datascience and useful extensions
 boto3 = "~=1.34.50"
 kafka-python = "~=2.0.2"
@@ -17,7 +26,8 @@ scikit-learn = "~=1.4.0"
 scipy = "~=1.12.0"
 skl2onnx = "~=1.16.0"
 onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
-codeflare-sdk = "~=0.16.3"
+codeflare-sdk = "~=0.16.0"
+
 # DB connectors
 pymongo = "~=4.6.2"
 psycopg = "~=3.1.18"

jupyter/datascience/ubi9-python-3.9/centos-crb.repo

@@ -0,0 +1,5 @@
+[centos-stream-9-crb]
+name=centos-stream-9-crb
+baseurl=https://mirror.stream.centos.org/9-stream/CRB/ppc64le/os
+enabled=1
+gpgcheck=0

jupyter/datascience/ubi9-python-3.9/constraints.txt

@@ -0,0 +1 @@
+cython<3.0.9

jupyter/pytorch/ubi9-python-3.9/Dockerfile

@@ -14,9 +14,15 @@ LABEL name="odh-notebook-jupyter-pytorch-ubi9-python-3.9" \
 # Install Python packages and Jupyterlab extensions from Pipfile.lock
 COPY Pipfile.lock ./
 
+# Switch to root user
+USER root
+
 RUN echo "Installing softwares and packages" && \
-    micropipenv install && \
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+    source "$HOME/.cargo/env" && \
+    GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true micropipenv install && \
     rm -f ./Pipfile.lock && \
+    rustup self uninstall -y && \
     # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
     sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
     # Disable announcement plugin of jupyterlab \
@@ -25,3 +31,6 @@ RUN echo "Installing softwares and packages" && \
 # Fix permissions to support pip in Openshift environments
 RUN chmod -R g+w /opt/app-root/lib/python3.9/site-packages && \
     fix-permissions /opt/app-root -P
+
+# Switch back to non-root user
+USER 1001

jupyter/pytorch/ubi9-python-3.9/Pipfile

@@ -8,13 +8,22 @@ url = "https://download.pytorch.org/whl/cu121"
 verify_ssl = true
 name = "pytorch"
 
+[[source]]
+url = "http://10.20.177.222:9000/"
+verify_ssl = false
+name = "localpi"
+
 [dev-packages]
 
 [packages]
 # PyTorch packages
 tensorboard = "~=2.16.2"
-torch = {version = "~=2.2.1", index = "pytorch"}
-torchvision = {version = "~=0.17.1", index = "pytorch"}
+torch = {version = "2.2.1a0", index = "localpi"}
+torchvision = {version = "0.17.*", index = "localpi"}
+ray = {version = "2.7.0.*", index="localpi"}
+py-spy = {version = "0.3.14.*", index="localpi"}
+pyarrow = {version = "15.0.1.dev0+g5ce6ff434.d20240426", index="localpi"}
+
 # Datascience and useful extensions
 boto3 = "~=1.34.50"
 kafka-python = "~=2.0.2"
@@ -26,14 +35,15 @@ scikit-learn = "~=1.4.0"
 scipy = "~=1.12.0"
 skl2onnx = "~=1.16.0"
 onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
-codeflare-sdk = "~=0.16.3"
+codeflare-sdk = "~=0.16.0"
+
 # DB connectors
 pymongo = "~=4.6.2"
 psycopg = "~=3.1.18"
 pyodbc = "~=5.1.0"
 mysql-connector-python = "~=8.3.0"
 # JupyterLab packages
-odh-elyra = "~=3.16.7"
+odh-elyra = "~=3.16.5"
 jupyterlab = "~=3.6.7" # Wait on upgrade till plugins are ready
 jupyter-bokeh = "~=3.0.7" # Upgrade would bring in jupyterlab 4
 jupyter-server = "~=2.13.0"
@@ -45,11 +55,6 @@ jupyterlab-widgets = "~=3.0.10"
 jupyter-resource-usage = "~=0.7.2"
 nbdime = "~=3.2.1"
 nbgitpuller = "~=1.2.0"
-# pycodestyle is dependency of below packages 
-# and to achieve compatible of pycodestyle with python-lsp-server[all]
-# pinned the below packages
-autopep8 = "~=2.0.4"
-flake8 = "~=7.0.0"
 # Base packages
 wheel = "~=0.43.0"
 setuptools = "~=69.2.0"