add cache concurrency patch

backported from pocl/pocl#1480, pocl/pocl@ed97458
conda-forge · May 23, 2024 · f30bac8 · f30bac8
1 parent 7a1910b
commit f30bac8
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 42 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_libhwloc2.10.0.yaml → .ci_support/linux_64_libhwloc1.yaml b/.ci_support/linux_64_libhwloc2.10.0.yaml → .ci_support/linux_64_libhwloc1.yaml
@@ -19,7 +19,7 @@ docker_image:
 enable_cuda:
 - 'True'
 libhwloc:
-- 2.10.0
+- '1'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/...support/linux_aarch64_libhwloc2.10.0.yaml → .ci_support/linux_aarch64_libhwloc1.yaml b/...support/linux_aarch64_libhwloc2.10.0.yaml → .ci_support/linux_aarch64_libhwloc1.yaml
@@ -23,7 +23,7 @@ docker_image:
 enable_cuda:
 - 'True'
 libhwloc:
-- 2.10.0
+- '1'
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/...support/linux_ppc64le_libhwloc2.10.0.yaml → .ci_support/linux_ppc64le_libhwloc1.yaml b/...support/linux_ppc64le_libhwloc2.10.0.yaml → .ci_support/linux_ppc64le_libhwloc1.yaml
@@ -19,7 +19,7 @@ docker_image:
 enable_cuda:
 - 'True'
 libhwloc:
-- 2.10.0
+- '1'
 target_platform:
 - linux-ppc64le
 zip_keys:

diff --git a/.ci_support/migrations/libhwloc2100.yaml b/.ci_support/migrations/libhwloc2100.yaml
diff --git a/.ci_support/osx_64_libhwloc2.10.0.yaml → .ci_support/osx_64_libhwloc1.yaml b/.ci_support/osx_64_libhwloc2.10.0.yaml → .ci_support/osx_64_libhwloc1.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 enable_cuda:
 - 'False'
 libhwloc:
-- 2.10.0
+- '1'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 target_platform:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 enable_cuda:
 - 'False'
 libhwloc:
-- 2.10.0
+- '2'
 macos_machine:
 - arm64-apple-darwin20.0.0
 target_platform:

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "5.0" %}
-{% set build_number = 4 %}
+{% set build_number = 5 %}
 {% set sha256 = "fd0bb6e50c2286278c11627b71177991519e1f7ab2576bd8d8742974db414549" %}
 
 {% set llvm_version = "15.0.7" %}
@@ -15,6 +15,10 @@ source:
       - patches/gh1392.patch
       - patches/alignof.diff  # [ppc64le]
 
+      # https://github.com/pocl/pocl/issues/1480, https://github.com/pocl/pocl/commit/ed97458ba737be9057f322594b7ff5701ad79b1f
+      # unnecessary after 5.0:
+      - patches/cache.diff
+
 build:
   number: {{ build_number }}
   skip: true  # [win]

diff --git a/recipe/patches/cache.diff b/recipe/patches/cache.diff
@@ -0,0 +1,29 @@
+diff --git a/lib/CL/pocl_file_util.c b/lib/CL/pocl_file_util.c
+index 281f6dbf84..377c653ca3 100644
+--- a/lib/CL/pocl_file_util.c
++++ b/lib/CL/pocl_file_util.c
+@@ -212,24 +212,6 @@ pocl_write_file (const char *path, const char *content, uint64_t count,
+   assert(content);
+   char path2[POCL_MAX_PATHNAME_LENGTH];
+   int err, fd = -1;
+-
+-  if (pocl_exists(path)) 
+-    {
+-      if (dont_rewrite) 
+-        {
+-          if (!append)
+-            return 0;
+-        } 
+-      else 
+-        {
+-          int res = pocl_remove(path);
+-          if (res)
+-            {
+-              POCL_MSG_ERR ("pocl_remove(%s) failed\n", path);
+-              return res;
+-            }
+-        }
+-    }
+
+   if (append)
+     {