intel-compute-runtime v21.12.19358

automerged PR by conda-forge/automerge-action
conda-forge · Mar 29, 2021 · 01975f4 · 01975f4
2 parents e3c31f3 + dcee6b0
commit 01975f4
Show file tree

Hide file tree

Showing 13 changed files with 181 additions and 67 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.ci_support/linux_.yaml → .ci_support/linux_64_.yaml b/.ci_support/linux_.yaml → .ci_support/linux_64_.yaml
@@ -1,10 +1,17 @@
+cdt_name:
+- cos6
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '7'
+- '9'
 docker_image:
-- condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-comp7
+target_platform:
+- linux-64
+zip_keys:
+- - cdt_name
+  - docker_image
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -11,6 +11,7 @@ cmake \
     -DIGC_DIR=$PREFIX \
     -DGMM_SOURCE_DIR=$PREFIX \
     -DTSAN_LIBS="-lrt" \
+    -DOCL_ICD_VENDORDIR=$PREFIX/etc/OpenCL/vendors \
     ..
 
 make -j${CPU_COUNT} VERBOSE=1

diff --git a/recipe/gh412.patch b/recipe/gh412.patch
@@ -0,0 +1,40 @@
+From 17bd7fa80f322bfff0e0fe060a5d20f1127a3fe4 Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Mon, 29 Mar 2021 16:24:46 -0500
+Subject: [PATCH] Link pthread and rt at the end
+
+NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE might need rt
+and linking order matters.
+---
+ shared/test/unit_test/CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt
+index a9963ef2d..e4a136bdd 100644
+--- a/shared/test/unit_test/CMakeLists.txt
++++ b/shared/test/unit_test/CMakeLists.txt
+@@ -99,18 +99,18 @@ if(NOT SKIP_UNIT_TESTS)
+                              ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX}
+   )
+
+-  if(UNIX)
+-    target_link_libraries(${TARGET_NAME} pthread rt)
+-  else()
+-    target_link_libraries(${TARGET_NAME} dbghelp)
+-  endif()
+-
+   target_link_libraries(${TARGET_NAME}
+                         gmock-gtest
+                         ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE}
+                         compute_runtime_mockable_extra
+   )
+
++  if(UNIX)
++    target_link_libraries(${TARGET_NAME} pthread rt)
++  else()
++    target_link_libraries(${TARGET_NAME} dbghelp)
++  endif()
++
+   if(MSVC)
+     set_target_properties(${TARGET_NAME} PROPERTIES
+                           VS_DEBUGGER_COMMAND_ARGUMENTS "--gtest_filter=* --gtest_catch_exceptions=0 --enable_default_listener --disable_pagefaulting_tests"