From 9a442748ea5f13652fe8ab91ae07296836622dcb Mon Sep 17 00:00:00 2001 From: vedithal-amd Date: Tue, 15 Jul 2025 17:06:22 -0400 Subject: [PATCH] Fix docker testing instructions (#813) [ROCm/rocprofiler-compute commit: ccb34e8a91cc1678be038c8ea1fc67558067e12a] --- projects/rocprofiler-compute/README.md | 6 +++-- .../docker/Dockerfile.test | 27 ------------------- .../docker/docker-compose.test.yml | 17 ------------ 3 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 projects/rocprofiler-compute/docker/Dockerfile.test delete mode 100644 projects/rocprofiler-compute/docker/docker-compose.test.yml diff --git a/projects/rocprofiler-compute/README.md b/projects/rocprofiler-compute/README.md index b56f8dce5e..4ef6fbe4e3 100644 --- a/projects/rocprofiler-compute/README.md +++ b/projects/rocprofiler-compute/README.md @@ -36,9 +36,11 @@ Users may checkout `amd-staging` to preview upcoming features. ## Testing +Populate the empty variables in `Dockerfile.customrocmtest` based on latest CI build information. + To quickly get the environment (bash shell) for building and testing, run the following commands: * `cd docker` -* `docker compose -f docker-compose.test.yml up --force-recreate -d && docker attach docker-test-1` +* `docker compose -f docker-compose.customrocmtest.yml up --force-recreate -d && docker attach docker-customrocmtest-1` Inside the docker container, clean, build and install the project with tests enabled: ``` @@ -54,7 +56,7 @@ ctest For manual testing, you can find the executable at `install/bin/rocprof-compute` -NOTE: This Dockerfile uses `rocm/dev-ubuntu-22.04` as the base image +NOTE: This Dockerfile uses `ubuntu 22.04` as the base operating system image ## Standalone binary diff --git a/projects/rocprofiler-compute/docker/Dockerfile.test b/projects/rocprofiler-compute/docker/Dockerfile.test deleted file mode 100644 index 6452309109..0000000000 --- a/projects/rocprofiler-compute/docker/Dockerfile.test +++ /dev/null @@ -1,27 +0,0 @@ -# Use a base image -FROM rocm/dev-ubuntu-22.04 - -# Set the working directory -WORKDIR /app - -# Update package list and install prerequisites -RUN apt-get update && apt-get install -y \ - software-properties-common cmake locales git \ - && add-apt-repository ppa:deadsnakes/ppa \ - && apt-get update - -# Allows running git commands in /app -RUN git config --global --add safe.directory /app - -# Install Python 3.10 and pip -RUN apt-get install -y python3.10 python3.10-venv python3.10-dev python3-pip libsqlite3-dev - -# Set Python 3.10 as the default python3 -RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1 - -# Install any dependencies specified in requirements.txt -# Run interactive bash shell -CMD ["/bin/bash", "-c", "\ - python3 -m pip install -r requirements.txt -r requirements-test.txt \ - && exec /bin/bash \ -"] diff --git a/projects/rocprofiler-compute/docker/docker-compose.test.yml b/projects/rocprofiler-compute/docker/docker-compose.test.yml deleted file mode 100644 index 6c7d0c0376..0000000000 --- a/projects/rocprofiler-compute/docker/docker-compose.test.yml +++ /dev/null @@ -1,17 +0,0 @@ -services: - test: - build: - context: ../ - dockerfile: docker/Dockerfile.test - devices: - - /dev/kfd - - /dev/dri - security_opt: - - seccomp:unconfined - volumes: - - ../:/app - - ../../rocprofiler-sdk:/rocprofiler-sdk - ports: - - 8050:8050 - tty: true - stdin_open: true