TOFIX: elezar suggestions

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

.github/workflows/image.yaml

@@ -40,11 +40,14 @@ jobs:
         - vectorAdd
         - nbody
         - deviceQuery
+        - nvbandwidth
         exclude:
         - dist: ubi8
           sample: deviceQuery
         - dist: ubi8
           sample: nbody
+        - dist: ubi8
+          sample: nvbandwidth
 
     steps:
       - uses: actions/checkout@v4
@@ -68,8 +71,12 @@ jobs:
           fi
           echo "PUSH_ON_BUILD=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
           echo "BUILD_MULTI_ARCH_IMAGES=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:master
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
@@ -86,30 +93,3 @@ jobs:
           echo "${VERSION}"
           SAMPLE=${{ matrix.sample }} make -f deployments/container/Makefile build-${{ matrix.dist }}
 
-  build-nvbandwidth:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:master
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build nvbandwidth image
-        env:
-          IMAGE_NAME: ghcr.io/nvidia/k8s-samples:nvbandwidth
-          CUDA_VERSION: 12.5.0
-          NVBANDWIDTH_VERSION: v0.7
-          PUSH_ON_BUILD: true
-          BUILD_MULTI_ARCH_IMAGES: true
-        run: |
-          echo "nvbandwidth ${NVBANDWIDTH_VERSION}"
-          make -f multinodeNVL/nvbandwidth/Makefile build

deployments/container/Makefile

@@ -80,7 +80,11 @@ endif
 endif
 
 build-%: DIST = $(*)
+ifneq ($(SAMPLE),nvbandwidth)
 build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile.$(DOCKERFILE_SUFFIX)
+else
+build-%: DOCKERFILE = $(CURDIR)/deployments/container/$(SAMPLE)/Dockerfile.$(DOCKERFILE_SUFFIX)
+endif
 
 build-ubuntu%: DOCKERFILE_SUFFIX = ubuntu
 

multinodeNVL/nvbandwidth/Dockerfile renamed to deployments/container/nvbandwidth/Dockerfile.ubuntu

@@ -12,9 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG CUDA_VERSION=12.5.0
-
-FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-devel-ubuntu22.04 AS builder
+FROM nvcr.io/nvidia/cuda:12.5.0-devel-ubuntu22.04 AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive