Fix deps for intel mlperf-inference-retinanet

mlcommons · Jun 30, 2024 · 253dd5b · 253dd5b
1 parent 54b898f
commit 253dd5b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/script/app-mlperf-inference-intel/_cm.yaml b/script/app-mlperf-inference-intel/_cm.yaml
@@ -431,18 +431,23 @@ variations:
         - conda-package
         - mkl
         tags: get,generic,conda-package,_package.mkl,_source.conda-forge
-        enable_if_env:
-          CM_MLPERF_INFERENCE_CODE_VERSION:
-          -  v4.0
-        names:
+      - names:
           - conda-package
           - libstdcxx-ng
         tags: get,generic,conda-package,_package.libstdcxx-ng,_source.conda-forge
 
+      - names:
+        - conda-package
+        - mkl
+        tags: get,generic,conda-package,_package.mkl,_source.intel
       - names:
         - conda-package
         - mkl-include
         tags: get,generic,conda-package,_package.mkl-include,_source.intel
+      - names:
+        - conda-package
+        - intel-openmp
+        tags: get,generic,conda-package,_package.intel-openmp,_source.intel
       - names:
         - conda-package
         - llvm-openmp
@@ -494,6 +499,14 @@ variations:
         names:
           - pip-package
           - scikit-learn
+      - tags: get,generic-python-lib,_package.opencv-python
+        names:
+          - pip-package
+          - opencv-python
+      - tags: get,generic-python-lib,_package.pycocotools
+        names:
+          - pip-package
+          - pycocotools
       - tags: install,ipex,from.src,_for-intel-mlperf-inference-v3.1-retinanet
         names:
           - ipex-from-src
@@ -507,8 +520,6 @@ variations:
       - tags: get,mlcommons,inference,loadgen,_custom-python,_keep-build
         names:
         - inference-loadgen
-        env:
-          CM_PYTHON_BIN_WITH_PATH: "<<<CM_CONDA_BIN_PATH>>>/python3"
 
 
   retinanet,build-harness:

diff --git a/script/app-mlperf-inference-intel/build_retinanet_harness.sh b/script/app-mlperf-inference-intel/build_retinanet_harness.sh
@@ -1,6 +1,4 @@
 export PATH=${CM_CONDA_BIN_PATH}:$PATH
-echo $PWD
-
 
 cd ${CM_HARNESS_CODE_ROOT}
 
@@ -19,18 +17,16 @@ export LOADGEN_DIR="${CM_MLPERF_INFERENCE_LOADGEN_INSTALL_PATH}/../"
 export OPENCV_DIR=${CM_OPENCV_BUILD_PATH}
 export RAPIDJSON_INCLUDE_DIR=${CM_RAPIDJSON_SRC_REPO_PATH}/include
 export GFLAGS_DIR=${CM_GFLAGS_BUILD_PATH}
-#export ONEDNN_DIR=${CM_ONEDNN_INSTALLED_PATH}
 export USE_CUDA=0
 
 BUILD_DIR=${PWD}/build
 rm -rf "$BUILD_DIR"
 
 SRC_DIR=${PWD}/src
 
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${OPENCV_DIR}/lib:${ONEDNN_DIR}/build/src:${CONDA_PREFIX}/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${OPENCV_DIR}/lib:${ONEDNN_DIR}/build/src
 export LIBRARY_PATH=${LIBRARY_PATH}:${CONDA_PREFIX}/lib
 
-
 cmd="cmake -DCMAKE_PREFIX_PATH=${TORCH_PATH} \
     -DLOADGEN_DIR=${LOADGEN_DIR} \
     -DOpenCV_DIR=${OPENCV_DIR} \