From 2da413213dd93de9ea52eabe3cbecdd916cc3052 Mon Sep 17 00:00:00 2001
From: Srikanth Ramakrishna <srikanth.ramakrishna@intel.com>
Date: Fri, 20 Dec 2024 12:23:56 -0800
Subject: [PATCH] uncomment other tests

Signed-off-by: Srikanth Ramakrishna <srikanth.ramakrishna@intel.com>
---
 pytorch/docker-compose.yaml | 64 ++++++++++++++++++-------------------
 pytorch/tests/tests.yaml    | 64 ++++++++++++++++++-------------------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/pytorch/docker-compose.yaml b/pytorch/docker-compose.yaml
index daa8c134..9fbe427e 100644
--- a/pytorch/docker-compose.yaml
+++ b/pytorch/docker-compose.yaml
@@ -51,24 +51,24 @@ services:
       - ${PACKAGE_OPTION:-pip}
     image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-base
     pull_policy: always
-  # jupyter:
-  #   build:
-  #     labels:
-  #       dependency.python.pip: jupyter-requirements.txt
-  #       org.opencontainers.base.name: "intel/intel-optimized-pytorch:${IPEX_VERSION:-2.5.0}-${PACKAGE_OPTION:-pip}-base"
-  #       org.opencontainers.image.title: "Intel® Extension for PyTorch Jupyter Image"
-  #       org.opencontainers.image.version: ${IPEX_VERSION:-2.5.0}-${PACKAGE_OPTION:-pip}-jupyter
-  #     target: jupyter
-  #   command: >
-  #     bash -c "python -m jupyter --version"
-  #   environment:
-  #     http_proxy: ${http_proxy}
-  #     https_proxy: ${https_proxy}
-  #   extends: ipex-base
-  #   image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-jupyter
-  #   network_mode: host
-  #   ports:
-  #     - 8888:8888
+  jupyter:
+    build:
+      labels:
+        dependency.python.pip: jupyter-requirements.txt
+        org.opencontainers.base.name: "intel/intel-optimized-pytorch:${IPEX_VERSION:-2.5.0}-${PACKAGE_OPTION:-pip}-base"
+        org.opencontainers.image.title: "Intel® Extension for PyTorch Jupyter Image"
+        org.opencontainers.image.version: ${IPEX_VERSION:-2.5.0}-${PACKAGE_OPTION:-pip}-jupyter
+      target: jupyter
+    command: >
+      bash -c "python -m jupyter --version"
+    environment:
+      http_proxy: ${http_proxy}
+      https_proxy: ${https_proxy}
+    extends: ipex-base
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-jupyter
+    network_mode: host
+    ports:
+      - 8888:8888
   ipex-xpu-base:
     build:
       args:
@@ -91,20 +91,20 @@ services:
     depends_on:
       - xpu
     image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-base
-  # xpu-jupyter:
-  #   build:
-  #     labels:
-  #       dependency.python.pip: jupyter-requirements.txt
-  #       org.opencontainers.base.name: "intel/intel-optimized-pytorch:${IPEX_VERSION:-2.5.10}-xpu-${PACKAGE_OPTION:-pip}-base"
-  #       org.opencontainers.image.title: "Intel® Extension for PyTorch XPU Jupyter Image"
-  #       org.opencontainers.image.version: ${IPEX_VERSION:-2.5.10}-xpu-${PACKAGE_OPTION:-pip}-jupyter
-  #     target: ipex-xpu-jupyter
-  #   command: >
-  #     bash -c "python -m jupyter --version"
-  #   extends: ipex-xpu-base
-  #   image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-jupyter
-  #   ports:
-  #     - 8888:8888
+  xpu-jupyter:
+    build:
+      labels:
+        dependency.python.pip: jupyter-requirements.txt
+        org.opencontainers.base.name: "intel/intel-optimized-pytorch:${IPEX_VERSION:-2.5.10}-xpu-${PACKAGE_OPTION:-pip}-base"
+        org.opencontainers.image.title: "Intel® Extension for PyTorch XPU Jupyter Image"
+        org.opencontainers.image.version: ${IPEX_VERSION:-2.5.10}-xpu-${PACKAGE_OPTION:-pip}-jupyter
+      target: ipex-xpu-jupyter
+    command: >
+      bash -c "python -m jupyter --version"
+    extends: ipex-xpu-base
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-jupyter
+    ports:
+      - 8888:8888
   torchserve-cpu:
     build:
       args:
diff --git a/pytorch/tests/tests.yaml b/pytorch/tests/tests.yaml
index 11d2217e..c24521bb 100644
--- a/pytorch/tests/tests.yaml
+++ b/pytorch/tests/tests.yaml
@@ -12,35 +12,35 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# import-ipex-cpu-${PACKAGE_OPTION:-pip}:
-#   img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-base
-#   cmd: python -c "import torch;import intel_extension_for_pytorch as ipex;print(f'torch {torch.__version__} ipex {ipex.__version__}')"
-# import-ipex-xpu-${PACKAGE_OPTION:-pip}:
-#   img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-base
-#   cmd: python -c "import torch; import intel_extension_for_pytorch as ipex;[print(f'[{i}] {torch.xpu.get_device_properties(i)}') for i in range(torch.xpu.device_count())];"
-#   device: ["/dev/dri"]
-# import-cpu-jupyter-${PACKAGE_OPTION:-pip}:
-#   img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-jupyter
-#   cmd: python -m jupyter --version
-# import-xpu-jupyter-${PACKAGE_OPTION:-pip}:
-#   img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-jupyter
-#   cmd: python -m jupyter --version
-#   device: ["/dev/dri"]
-# ipex-cpu-${PACKAGE_OPTION:-pip}:
-#   img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-base
-#   cmd: python /tests/ipex-resnet50.py --ipex --device cpu --backend gloo
-#   volumes:
-#   - dst: /tests
-#     src: $PWD/pytorch/tests
-# ipex-xpu-${PACKAGE_OPTION:-pip}:
-#   img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-base
-#   cmd: python /tests/ipex-resnet50.py --ipex --device xpu
-#   device: ["/dev/dri"]
-#   volumes:
-#   - dst: /tests
-#     src: $PWD/pytorch/tests
-# ipex-xpu-jupyter-${PACKAGE_OPTION:-pip}:
-#   img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-jupyter
-#   cmd: papermill --log-output  /jupyter/xpu.ipynb -k python3
-#   device: ["/dev/dri"]
-#   notebook: True
+import-ipex-cpu-${PACKAGE_OPTION:-pip}:
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-base
+  cmd: python -c "import torch;import intel_extension_for_pytorch as ipex;print(f'torch {torch.__version__} ipex {ipex.__version__}')"
+import-ipex-xpu-${PACKAGE_OPTION:-pip}:
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-base
+  cmd: python -c "import torch; import intel_extension_for_pytorch as ipex;[print(f'[{i}] {torch.xpu.get_device_properties(i)}') for i in range(torch.xpu.device_count())];"
+  device: ["/dev/dri"]
+import-cpu-jupyter-${PACKAGE_OPTION:-pip}:
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-jupyter
+  cmd: python -m jupyter --version
+import-xpu-jupyter-${PACKAGE_OPTION:-pip}:
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-jupyter
+  cmd: python -m jupyter --version
+  device: ["/dev/dri"]
+ipex-cpu-${PACKAGE_OPTION:-pip}:
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.0}-base
+  cmd: python /tests/ipex-resnet50.py --ipex --device cpu --backend gloo
+  volumes:
+  - dst: /tests
+    src: $PWD/pytorch/tests
+ipex-xpu-${PACKAGE_OPTION:-pip}:
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-base
+  cmd: python /tests/ipex-resnet50.py --ipex --device xpu
+  device: ["/dev/dri"]
+  volumes:
+  - dst: /tests
+    src: $PWD/pytorch/tests
+ipex-xpu-jupyter-${PACKAGE_OPTION:-pip}:
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-ipex-${IPEX_VERSION:-2.5.10}-xpu-jupyter
+  cmd: papermill --log-output  /jupyter/xpu.ipynb -k python3
+  device: ["/dev/dri"]
+  notebook: True