Skip to content

Pr 20 #1

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

Open
smoparth wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Pr 20 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
name: Detect Changes
runs-on: ubuntu-latest
outputs:
cuda-12-8: ${{ steps.filter.outputs.cuda-12-8 }}
cuda-12-9: ${{ steps.filter.outputs.cuda-12-9 }}
cuda-13-0: ${{ steps.filter.outputs.cuda-13-0 }}
cuda-13-1: ${{ steps.filter.outputs.cuda-13-1 }}
python-3-12: ${{ steps.filter.outputs.python-3-12 }}
any-cuda: ${{ steps.filter.outputs.any-cuda }}
any-python: ${{ steps.filter.outputs.any-python }}
cuda-12-8: ${{ steps.filter.outputs['cuda-12-8'] }}
cuda-12-9: ${{ steps.filter.outputs['cuda-12-9'] }}
cuda-13-0: ${{ steps.filter.outputs['cuda-13-0'] }}
cuda-13-1: ${{ steps.filter.outputs['cuda-13-1'] }}
python-3-12: ${{ steps.filter.outputs['python-3-12'] }}
any-cuda: ${{ steps.filter.outputs['any-cuda'] }}
any-python: ${{ steps.filter.outputs['any-python'] }}
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
# Run when Python-related files change AND lint-containerfiles passed/skipped
if: |
always() &&
needs.changes.outputs.any-python == 'true' &&
needs.changes.outputs['any-python'] == 'true' &&
needs.lint.result == 'success' &&
needs.type-check.result == 'success' &&
(needs.lint-containerfiles.result == 'success' || needs.lint-containerfiles.result == 'skipped')
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
# Run when CUDA-related files change AND lint-containerfiles passed/skipped
if: |
always() &&
needs.changes.outputs.any-cuda == 'true' &&
needs.changes.outputs['any-cuda'] == 'true' &&
needs.lint.result == 'success' &&
needs.type-check.result == 'success' &&
(needs.lint-containerfiles.result == 'success' || needs.lint-containerfiles.result == 'skipped')
Expand Down
3 changes: 2 additions & 1 deletion Containerfile.cuda.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ RUN dnf clean all && \
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
ARG PYTHON_VERSION

LABEL name="odh-midstream-cuda-base" \
version="${VERSION}" \
Expand All @@ -244,7 +245,7 @@ LABEL name="odh-midstream-cuda-base" \
com.nvidia.cudnn.version="${NV_CUDNN_VERSION}" \
com.nvidia.nccl.version="${NCCL_VERSION}" \
com.opendatahub.accelerator="cuda" \
com.opendatahub.python="3.12"
com.opendatahub.python="${PYTHON_VERSION}"

# -----------------------------------------------------------------------------
# User Configuration (from notebooks pattern)
Expand Down
3 changes: 2 additions & 1 deletion cuda/12.8/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ RUN dnf clean all && \
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
ARG PYTHON_VERSION

LABEL name="odh-midstream-cuda-base" \
version="${VERSION}" \
Expand All @@ -244,7 +245,7 @@ LABEL name="odh-midstream-cuda-base" \
com.nvidia.cudnn.version="${NV_CUDNN_VERSION}" \
com.nvidia.nccl.version="${NCCL_VERSION}" \
com.opendatahub.accelerator="cuda" \
com.opendatahub.python="3.12"
com.opendatahub.python="${PYTHON_VERSION}"

# -----------------------------------------------------------------------------
# User Configuration (from notebooks pattern)
Expand Down
3 changes: 3 additions & 0 deletions cuda/12.8/app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
# -----------------------------------------------------------------------------
IMAGE_TAG=12.8-py312

# Python version bundled with this CUDA image (used in container labels)
PYTHON_VERSION=3.12

# -----------------------------------------------------------------------------
# Base Image
# -----------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion cuda/12.9/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ RUN dnf clean all && \
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
ARG PYTHON_VERSION

LABEL name="odh-midstream-cuda-base" \
version="${VERSION}" \
Expand All @@ -244,7 +245,7 @@ LABEL name="odh-midstream-cuda-base" \
com.nvidia.cudnn.version="${NV_CUDNN_VERSION}" \
com.nvidia.nccl.version="${NCCL_VERSION}" \
com.opendatahub.accelerator="cuda" \
com.opendatahub.python="3.12"
com.opendatahub.python="${PYTHON_VERSION}"

# -----------------------------------------------------------------------------
# User Configuration (from notebooks pattern)
Expand Down
3 changes: 3 additions & 0 deletions cuda/12.9/app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
# -----------------------------------------------------------------------------
IMAGE_TAG=12.9-py312

# Python version bundled with this CUDA image (used in container labels)
PYTHON_VERSION=3.12

# -----------------------------------------------------------------------------
# Base Image
# -----------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion cuda/13.0/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ RUN dnf clean all && \
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
ARG PYTHON_VERSION

LABEL name="odh-midstream-cuda-base" \
version="${VERSION}" \
Expand All @@ -244,7 +245,7 @@ LABEL name="odh-midstream-cuda-base" \
com.nvidia.cudnn.version="${NV_CUDNN_VERSION}" \
com.nvidia.nccl.version="${NCCL_VERSION}" \
com.opendatahub.accelerator="cuda" \
com.opendatahub.python="3.12"
com.opendatahub.python="${PYTHON_VERSION}"

# -----------------------------------------------------------------------------
# User Configuration (from notebooks pattern)
Expand Down
3 changes: 3 additions & 0 deletions cuda/13.0/app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
# -----------------------------------------------------------------------------
IMAGE_TAG=13.0-py312

# Python version bundled with this CUDA image (used in container labels)
PYTHON_VERSION=3.12

# -----------------------------------------------------------------------------
# Base Image
# -----------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion cuda/13.1/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ RUN dnf clean all && \
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
ARG PYTHON_VERSION

LABEL name="odh-midstream-cuda-base" \
version="${VERSION}" \
Expand All @@ -244,7 +245,7 @@ LABEL name="odh-midstream-cuda-base" \
com.nvidia.cudnn.version="${NV_CUDNN_VERSION}" \
com.nvidia.nccl.version="${NCCL_VERSION}" \
com.opendatahub.accelerator="cuda" \
com.opendatahub.python="3.12"
com.opendatahub.python="${PYTHON_VERSION}"

# -----------------------------------------------------------------------------
# User Configuration (from notebooks pattern)
Expand Down
3 changes: 3 additions & 0 deletions cuda/13.1/app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
# -----------------------------------------------------------------------------
IMAGE_TAG=13.1-py312

# Python version bundled with this CUDA image (used in container labels)
PYTHON_VERSION=3.12

# -----------------------------------------------------------------------------
# Base Image
# -----------------------------------------------------------------------------
Expand Down
10 changes: 6 additions & 4 deletions scripts/generate-containerfile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ generate_python() {
}

main() {
# Handle help flags first (before arg count check)
if [[ "${1:-}" == "-h" || "${1:-}" == "--help" || "${1:-}" == "help" ]]; then
print_usage
exit 0
fi

if [[ $# -lt 2 ]]; then
log_error "Missing arguments"
print_usage
Expand All @@ -182,10 +188,6 @@ main() {
python)
generate_python "${version}"
;;
-h|--help|help)
print_usage
exit 0
;;
*)
log_error "Unknown type: ${type}"
print_usage
Expand Down