Derive pytorch back from cuda data science notebook (#112)

opendatahub-io · Jun 15, 2023 · 3f835fb · 3f835fb
1 parent 6332c3b
commit 3f835fb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -57,11 +57,6 @@ jupyter-minimal-ubi8-python-3.8: base-ubi8-python-3.8
 jupyter-datascience-ubi8-python-3.8: jupyter-minimal-ubi8-python-3.8
 	$(call image,$@,jupyter/datascience/ubi8-python-3.8,$<)
 
-# Build and push jupyter-pytorch-ubi8-python-3.8 image to the registry
-.PHONY: jupyter-pytorch-ubi8-python-3.8
-jupyter-pytorch-ubi8-python-3.8: jupyter-datascience-ubi8-python-3.8
-	$(call image,$@,jupyter/pytorch/ubi8-python-3.8,$<)
-
 # Build and push cuda-ubi8-python-3.8 image to the registry
 .PHONY: cuda-ubi8-python-3.8
 cuda-ubi8-python-3.8: base-ubi8-python-3.8
@@ -83,6 +78,11 @@ cuda-jupyter-datascience-ubi8-python-3.8: cuda-jupyter-minimal-ubi8-python-3.8
 cuda-jupyter-tensorflow-ubi8-python-3.8: cuda-jupyter-datascience-ubi8-python-3.8
 	$(call image,$@,jupyter/tensorflow/ubi8-python-3.8,$<)
 
+# Build and push jupyter-pytorch-ubi8-python-3.8 image to the registry
+.PHONY: jupyter-pytorch-ubi8-python-3.8
+jupyter-pytorch-ubi8-python-3.8: cuda-jupyter-datascience-ubi9-python-3.9
+	$(call image,$@,jupyter/pytorch/ubi8-python-3.8,$<)
+
 # Build and push runtime-datascience-ubi8-python-3.8 image to the registry
 .PHONY: runtime-datascience-ubi8-python-3.8
 runtime-datascience-ubi8-python-3.8: base-ubi8-python-3.8
@@ -115,11 +115,6 @@ jupyter-minimal-ubi9-python-3.9: base-ubi9-python-3.9
 jupyter-datascience-ubi9-python-3.9: jupyter-minimal-ubi9-python-3.9
 	$(call image,$@,jupyter/datascience/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: jupyter-datascience-ubi9-python-3.9
-	$(call image,$@,jupyter/pytorch/ubi9-python-3.9,$<)
-
 # Build and push cuda-ubi9-python-3.9 image to the registry
 .PHONY: cuda-ubi9-python-3.9
 cuda-ubi9-python-3.9: base-ubi9-python-3.9
@@ -140,6 +135,11 @@ 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: jupyter-pytorch-ubi9-python-3.9
+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-trustyai-ubi9-python-3.9 image to the registry
 .PHONY: jupyter-trustyai-ubi9-python-3.9
 jupyter-trustyai-ubi9-python-3.9: jupyter-datascience-ubi9-python-3.9
@@ -390,3 +390,4 @@ refresh-pipfilelock-files:
 	cd runtimes/tensorflow/ubi8-python-3.8 && pipenv lock
 	cd runtimes/tensorflow/ubi9-python-3.9 && pipenv lock
 	cd base/c9s-python-3.9 && pipenv lock
+
diff --git a/README.md b/README.md
@@ -16,7 +16,6 @@ graph TB
         base-ubi8-python-3.8("Notebooks Base<br/>(base-ubi8-python-3.8)");
         jupyter-minimal-ubi8-python-3.8("Minimal Notebook<br/>(jupyter-minimal-ubi8-python-3.8)");
         jupyter-datascience-ubi8-python-3.8("Data Science Notebook<br/>(jupyter-datascience-ubi8-python-3.8)");
-        jupyter-pytorch-ubi8-python-3.8("PyTorch Notebook<br/>(jupyter-pytorch-ubi8-python-3.8)");
 
         %% Edges
         ubi8-python-3.8 --> base-ubi8-python-3.8;
@@ -30,12 +29,14 @@ graph TB
         cuda-ubi8-python-3.8("CUDA Notebooks Base<br/>(cuda-ubi8-python-3.8)");
         cuda-jupyter-minimal-ubi8-python-3.8("CUDA Minimal Notebook<br/>(cuda-jupyter-minimal-ubi8-python-3.8)");
         cuda-jupyter-datascience-ubi8-python-3.8("CUDA Data Science Notebook<br/>(cuda-jupyter-datascience-ubi8-python-3.8)");
+        cuda-jupyter-pytorch-ubi8-python-3.8("PyTorch Notebook<br/>(cuda-jupyter-pytorch-ubi8-python-3.8)");
         cuda-jupyter-tensorflow-ubi8-python-3.8("CUDA TensorFlow Notebook<br/>(cuda-jupyter-tensorflow-ubi8-python-3.8)");
 
         %% Edges
         base-ubi8-python-3.8 --> cuda-ubi8-python-3.8;
         cuda-ubi8-python-3.8 --> cuda-jupyter-minimal-ubi8-python-3.8;
         cuda-jupyter-minimal-ubi8-python-3.8 --> cuda-jupyter-datascience-ubi8-python-3.8;
+        cuda-jupyter-datascience-ubi8-python-3.8 --> cuda-jupyter-pytorch-ubi8-python-3.8;
         cuda-jupyter-datascience-ubi8-python-3.8 --> cuda-jupyter-tensorflow-ubi8-python-3.8;
     end
 
@@ -62,14 +63,12 @@ graph TB
         base-ubi9-python-3.9("Notebooks Base<br/>(base-ubi9-python-3.9)");
         jupyter-minimal-ubi9-python-3.9("Minimal Notebook<br/>(jupyter-minimal-ubi9-python-3.9)");
         jupyter-datascience-ubi9-python-3.9("Data Science Notebook<br/>(jupyter-datascience-ubi9-python-3.9)");
-        jupyter-pytorch-ubi9-python-3.9("PyTorch Notebook<br/>(jupyter-pytorch-ubi9-python-3.9)");
         jupyter-trustyai-ubi9-python-3.9("TrustyAI Notebook<br/>(jupyter-trustyai-ubi9-python-3.9)");
 
         %% Edges
         ubi9-python-3.9 --> base-ubi9-python-3.9;
         base-ubi9-python-3.9 --> jupyter-minimal-ubi9-python-3.9;
         jupyter-minimal-ubi9-python-3.9 --> jupyter-datascience-ubi9-python-3.9;
-        jupyter-datascience-ubi9-python-3.9 --> jupyter-pytorch-ubi9-python-3.9;
         jupyter-datascience-ubi9-python-3.9 --> jupyter-trustyai-ubi9-python-3.9;
     end
 
@@ -78,12 +77,14 @@ graph TB
         cuda-ubi9-python-3.9("CUDA Notebooks Base<br/>(cuda-ubi9-python-3.9)");
         cuda-jupyter-minimal-ubi9-python-3.9("CUDA Minimal Notebook<br/>(cuda-jupyter-minimal-ubi9-python-3.9)");
         cuda-jupyter-datascience-ubi9-python-3.9("CUDA Data Science Notebook<br/>(cuda-jupyter-datascience-ubi9-python-3.9)");
+        cuda-jupyter-pytorch-ubi9-python-3.9("CUDA PyTorch Notebook<br/>(cuda-jupyter-pytorch-ubi9-python-3.9)");
         cuda-jupyter-tensorflow-ubi9-python-3.9("CUDA TensorFlow Notebook<br/>(cuda-jupyter-tensorflow-ubi9-python-3.9)");
 
         %% Edges
         base-ubi9-python-3.9 --> cuda-ubi9-python-3.9;
         cuda-ubi9-python-3.9 --> cuda-jupyter-minimal-ubi9-python-3.9;
         cuda-jupyter-minimal-ubi9-python-3.9 --> cuda-jupyter-datascience-ubi9-python-3.9;
+        cuda-jupyter-datascience-ubi9-python-3.9 --> cuda-jupyter-pytorch-ubi9-python-3.9;
         cuda-jupyter-datascience-ubi9-python-3.9 --> cuda-jupyter-tensorflow-ubi9-python-3.9;
     end