Skip to content

Commit

Permalink
Remove all images and Makefile calls to Python 3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@daniellutz
daniellutz committed Sep 19, 2024
1 parent d4183a4 commit 00f8513
Show file tree
Hide file tree
Showing 109 changed files with 0 additions and 31,570 deletions.
150 changes: 0 additions & 150 deletions .github/workflows/build-notebooks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,136 +15,6 @@
]
},
"jobs": {
"base-ubi8-python-3_8": {
"needs": [],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "base-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"jupyter-minimal-ubi8-python-3_8": {
"needs": [
"base-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "jupyter-minimal-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"jupyter-datascience-ubi8-python-3_8": {
"needs": [
"jupyter-minimal-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "jupyter-datascience-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"cuda-ubi8-python-3_8": {
"needs": [
"base-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "cuda-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"cuda-jupyter-minimal-ubi8-python-3_8": {
"needs": [
"cuda-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "cuda-jupyter-minimal-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"cuda-jupyter-datascience-ubi8-python-3_8": {
"needs": [
"cuda-jupyter-minimal-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "cuda-jupyter-datascience-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"habana-jupyter-1_10_0-ubi8-python-3_8": {
"needs": [
"jupyter-datascience-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "habana-jupyter-1.10.0-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"habana-jupyter-1_13_0-ubi8-python-3_8": {
"needs": [
"jupyter-datascience-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "habana-jupyter-1.13.0-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"runtime-minimal-ubi8-python-3_8": {
"needs": [
"base-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "runtime-minimal-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"runtime-datascience-ubi8-python-3_8": {
"needs": [
"base-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "runtime-datascience-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"runtime-pytorch-ubi8-python-3_8": {
"needs": [
"base-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "runtime-pytorch-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"runtime-cuda-tensorflow-ubi8-python-3_8": {
"needs": [
"cuda-ubi8-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "runtime-cuda-tensorflow-ubi8-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"base-ubi9-python-3_9": {
"needs": [],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
Expand Down Expand Up @@ -840,26 +710,6 @@
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"base-anaconda-python-3_8": {
"needs": [],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "base-anaconda-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
},
"jupyter-datascience-anaconda-python-3_8": {
"needs": [
"base-anaconda-python-3_8"
],
"uses": "./.github/workflows/build-notebooks-TEMPLATE.yaml",
"with": {
"target": "jupyter-datascience-anaconda-python-3.8",
"github": "${{ toJSON(github) }}"
},
"secrets": "inherit"
}
}
}
129 changes: 0 additions & 129 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,69 +77,6 @@ define image
)
endef

####################################### Buildchain for Python 3.8 using ubi8 #######################################

# Build and push base-ubi8-python-3.8 image to the registry
.PHONY: base-ubi8-python-3.8
base-ubi8-python-3.8:
$(call image,$@,base/ubi8-python-3.8)

# Build and push jupyter-minimal-ubi8-python-3.8 image to the registry
.PHONY: jupyter-minimal-ubi8-python-3.8
jupyter-minimal-ubi8-python-3.8: base-ubi8-python-3.8
$(call image,$@,jupyter/minimal/ubi8-python-3.8,$<)

# Build and push jupyter-datascience-ubi8-python-3.8 image to the registry
.PHONY: jupyter-datascience-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 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
$(eval $(call generate_image_tag,IMAGE_TAG))
$(call image,$@,cuda/ubi8-python-3.8,$<)

# Build and push cuda-jupyter-minimal-ubi8-python-3.8 image to the registry
.PHONY: cuda-jupyter-minimal-ubi8-python-3.8
cuda-jupyter-minimal-ubi8-python-3.8: cuda-ubi8-python-3.8
$(call image,$@,jupyter/minimal/ubi8-python-3.8,$<)

# Build and push cuda-jupyter-datascience-ubi8-python-3.8 image to the registry
.PHONY: cuda-jupyter-datascience-ubi8-python-3.8
cuda-jupyter-datascience-ubi8-python-3.8: cuda-jupyter-minimal-ubi8-python-3.8
$(call image,$@,jupyter/datascience/ubi8-python-3.8,$<)

# Build and push habana-jupyter-1.10.0-ubi8-python-3.8 image to the registry
.PHONY: habana-jupyter-1.10.0-ubi8-python-3.8
habana-jupyter-1.10.0-ubi8-python-3.8: jupyter-datascience-ubi8-python-3.8
$(call image,$@,habana/1.10.0/ubi8-python-3.8,$<)

# Build and push habana-jupyter-1.13.0-ubi8-python-3.8 image to the registry
.PHONY: habana-jupyter-1.13.0-ubi8-python-3.8
habana-jupyter-1.13.0-ubi8-python-3.8: jupyter-datascience-ubi8-python-3.8
$(call image,$@,habana/1.13.0/ubi8-python-3.8,$<)

# Build and push runtime-minimal-ubi8-python-3.8 image to the registry
.PHONY: runtime-minimal-ubi8-python-3.8
runtime-minimal-ubi8-python-3.8: base-ubi8-python-3.8
$(call image,$@,runtimes/minimal/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
$(call image,$@,runtimes/datascience/ubi8-python-3.8,$<)

# Build and push runtime-pytorch-ubi8-python-3.8 image to the registry
.PHONY: runtime-pytorch-ubi8-python-3.8
runtime-pytorch-ubi8-python-3.8: base-ubi8-python-3.8
$(call image,$@,runtimes/pytorch/ubi8-python-3.8,$<)

# Build and push runtime-cuda-tensorflow-ubi8-python-3.8 image to the registry
.PHONY: runtime-cuda-tensorflow-ubi8-python-3.8
runtime-cuda-tensorflow-ubi8-python-3.8: cuda-ubi8-python-3.8
$(call image,$@,runtimes/tensorflow/ubi8-python-3.8,$<)

####################################### Buildchain for Python 3.9 using ubi9 #######################################

# Build and push base-ubi9-python-3.9 image to the registry
Expand Down Expand Up @@ -460,19 +397,6 @@ rocm-runtime-pytorch-ubi9-python-3.11: rocm-ubi9-python-3.11
rocm-runtime-tensorflow-ubi9-python-3.11: rocm-ubi9-python-3.11
$(call image,$@,runtimes/rocm-tensorflow/ubi9-python-3.11,$<)

####################################### Buildchain for Anaconda Python #######################################

# Build and push base-anaconda-python-3.8 image to the registry
.PHONY: base-anaconda-python-3.8
base-anaconda-python-3.8:
$(call image,$@,base/anaconda-python-3.8)

# Build and push jupyter-datascience-anaconda-python-3.8 image to the registry
.PHONY: jupyter-datascience-anaconda-python-3.8
jupyter-datascience-anaconda-python-3.8: base-anaconda-python-3.8
$(call image,$@,jupyter/datascience/anaconda-python-3.8,$<)


####################################### Deployments #######################################

# Download kubectl binary
Expand All @@ -485,30 +409,6 @@ ifeq (,$(wildcard $(KUBECTL_BIN)))
@chmod +x $(KUBECTL_BIN)
endif

# Deploy a notebook image using kustomize
.PHONY: deploy8
deploy8-%-ubi8-python-3.8: bin/kubectl
$(eval NOTEBOOK_DIR := $(subst -,/,$(subst cuda-,,$*))/ubi8-python-3.8/kustomize/base)
ifndef NOTEBOOK_TAG
$(eval NOTEBOOK_TAG := $*-ubi8-python-3.8-$(IMAGE_TAG))
endif
$(info # Deploying notebook from $(NOTEBOOK_DIR) directory...)
@sed -i 's,newName: .*,newName: $(IMAGE_REGISTRY),g' $(NOTEBOOK_DIR)/kustomization.yaml
@sed -i 's,newTag: .*,newTag: $(NOTEBOOK_TAG),g' $(NOTEBOOK_DIR)/kustomization.yaml
$(KUBECTL_BIN) apply -k $(NOTEBOOK_DIR)

# Deploy a notebook image using kustomize
.PHONY: deploy-anaconda8
deploy8-%-anaconda-python-3.8: bin/kubectl
$(eval NOTEBOOK_DIR := $(subst -,/,$(subst cuda-,,$*))/anaconda-python-3.8/kustomize/base)
ifndef NOTEBOOK_TAG
$(eval NOTEBOOK_TAG := $*-anaconda-python-3.8-$(IMAGE_TAG))
endif
$(info # Deploying notebook from $(NOTEBOOK_DIR) directory...)
@sed -i 's,newName: .*,newName: $(IMAGE_REGISTRY),g' $(NOTEBOOK_DIR)/kustomization.yaml
@sed -i 's,newTag: .*,newTag: $(NOTEBOOK_TAG),g' $(NOTEBOOK_DIR)/kustomization.yaml
$(KUBECTL_BIN) apply -k $(NOTEBOOK_DIR)

.PHONY: deploy9
deploy9-%: bin/kubectl
$(eval TARGET := $(shell echo $* | sed 's/-ubi9-python.*//'))
Expand All @@ -522,19 +422,6 @@ endif
@sed -i 's,newTag: .*,newTag: $(NOTEBOOK_TAG),g' $(NOTEBOOK_DIR)/kustomization.yaml
$(KUBECTL_BIN) apply -k $(NOTEBOOK_DIR)

# Undeploy a notebook image using kustomize
.PHONY: undeploy8
undeploy8-%-ubi8-python-3.8: bin/kubectl
$(eval NOTEBOOK_DIR := $(subst -,/,$(subst cuda-,,$*))/ubi8-python-3.8/kustomize/base)
$(info # Undeploying notebook from $(NOTEBOOK_DIR) directory...)
$(KUBECTL_BIN) delete -k $(NOTEBOOK_DIR)

.PHONY: undeploy-anaconda8
undeploy8-%-anaconda-python-3.8: bin/kubectl
$(eval NOTEBOOK_DIR := $(subst -,/,$(subst cuda-,,$*))/anaconda-python-3.8/kustomize/base)
$(info # Undeploying notebook from $(NOTEBOOK_DIR) directory...)
$(KUBECTL_BIN) delete -k $(NOTEBOOK_DIR)

.PHONY: undeploy9
undeploy9-%: bin/kubectl
$(eval TARGET := $(shell echo $* | sed 's/-ubi9-python.*//'))
Expand Down Expand Up @@ -614,8 +501,6 @@ test-%: bin/kubectl
$(call test_with_papermill,intel/ml,ubi9,python-$(PYTHON_VERSION)) \
elif echo "$(FULL_NOTEBOOK_NAME)" | grep -q "trustyai-ubi9"; then \
$(call test_with_papermill,trustyai,ubi9,python-$(PYTHON_VERSION)) \
elif echo "$(FULL_NOTEBOOK_NAME)" | grep -q "minimal-ubi8"; then \
$(call test_with_papermill,minimal,ubi8,python-3.8) \
elif echo "$(FULL_NOTEBOOK_NAME)" | grep -q "datascience-ubi8"; then \
$(MAKE) validate-ubi8-datascience -e FULL_NOTEBOOK_NAME=$(FULL_NOTEBOOK_NAME); \
elif echo "$(FULL_NOTEBOOK_NAME)" | grep -q "anaconda"; then \
Expand All @@ -629,11 +514,6 @@ validate-ubi9-datascience:
$(call test_with_papermill,minimal,ubi9,python-$(PYTHON_VERSION))
$(call test_with_papermill,datascience,ubi9,python-$(PYTHON_VERSION))

.PHONY: validate-ubi8-datascience
validate-ubi8-datascience:
$(call test_with_papermill,minimal,ubi8,python-3.8)
$(call test_with_papermill,datascience,ubi8,python-3.8)

# Validate that runtime image meets minimum criteria
# This validation is created from subset of https://github.com/elyra-ai/elyra/blob/9c417d2adc9d9f972de5f98fd37f6945e0357ab9/Makefile#L325
.PHONY: validate-runtime-image
Expand Down Expand Up @@ -738,25 +618,16 @@ validate-rstudio-image: bin/kubectl
# This is only for the workflow action
.PHONY: refresh-pipfilelock-files
refresh-pipfilelock-files:
cd base/ubi8-python-3.8 && pipenv lock
cd base/ubi9-python-3.9 && pipenv lock
cd base/c9s-python-3.9 && pipenv lock
cd jupyter/minimal/ubi8-python-3.8 && pipenv lock
cd jupyter/minimal/ubi9-python-3.9 && pipenv lock
cd jupyter/datascience/ubi8-python-3.8 && pipenv lock
cd jupyter/datascience/ubi9-python-3.9 && pipenv lock
cd jupyter/pytorch/ubi9-python-3.9 && pipenv lock
cd jupyter/tensorflow/ubi9-python-3.9 && pipenv lock
cd jupyter/trustyai/ubi9-python-3.9 && pipenv lock
cd habana/1.10.0/ubi8-python-3.8 && pipenv lock
cd habana/1.13.0/ubi8-python-3.8 && pipenv lock
cd runtimes/minimal/ubi8-python-3.8 && pipenv lock
cd runtimes/minimal/ubi9-python-3.9 && pipenv lock
cd runtimes/datascience/ubi8-python-3.8 && pipenv lock
cd runtimes/datascience/ubi9-python-3.9 && pipenv lock
cd runtimes/pytorch/ubi9-python-3.9 && pipenv lock
cd runtimes/pytorch/ubi8-python-3.8 && pipenv lock
cd runtimes/tensorflow/ubi8-python-3.8 && pipenv lock
cd runtimes/tensorflow/ubi9-python-3.9 && pipenv lock
cd runtimes/rocm-tensorflow/ubi9-python-3.9 && pipenv lock
cd runtimes/rocm-pytorch/ubi9-python-3.9 && pipenv lock
Expand Down
Loading

0 comments on commit 00f8513

Please sign in to comment.