From f30bac895ef86ca59608583a96fae8c849d253e1 Mon Sep 17 00:00:00 2001 From: Matthias Diener Date: Thu, 23 May 2024 15:43:59 -0500 Subject: [PATCH] add cache concurrency patch backported from https://github.com/pocl/pocl/issues/1480, https://github.com/pocl/pocl/commit/ed97458ba737be9057f322594b7ff5701ad79b1f --- .azure-pipelines/azure-pipelines-linux.yml | 18 ++++++------ .azure-pipelines/azure-pipelines-osx.yml | 8 ++--- ...loc2.10.0.yaml => linux_64_libhwloc1.yaml} | 2 +- ...10.0.yaml => linux_aarch64_libhwloc1.yaml} | 2 +- ...10.0.yaml => linux_ppc64le_libhwloc1.yaml} | 2 +- .ci_support/migrations/libhwloc2100.yaml | 8 ----- ...hwloc2.10.0.yaml => osx_64_libhwloc1.yaml} | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .travis.yml | 4 +-- README.md | 26 ++++++++--------- recipe/meta.yaml | 6 +++- recipe/patches/cache.diff | 29 +++++++++++++++++++ 12 files changed, 67 insertions(+), 42 deletions(-) rename .ci_support/{linux_64_libhwloc2.10.0.yaml => linux_64_libhwloc1.yaml} (97%) rename .ci_support/{linux_aarch64_libhwloc2.10.0.yaml => linux_aarch64_libhwloc1.yaml} (97%) rename .ci_support/{linux_ppc64le_libhwloc2.10.0.yaml => linux_ppc64le_libhwloc1.yaml} (97%) delete mode 100644 .ci_support/migrations/libhwloc2100.yaml rename .ci_support/{osx_64_libhwloc2.10.0.yaml => osx_64_libhwloc1.yaml} (97%) create mode 100644 recipe/patches/cache.diff diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 1c9a2b6..8a42500 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,26 +8,26 @@ jobs: vmImage: ubuntu-latest strategy: matrix: + linux_64_libhwloc1: + CONFIG: linux_64_libhwloc1 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + SHORT_CONFIG: linux_64_libhwloc1 linux_64_libhwloc2: CONFIG: linux_64_libhwloc2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 SHORT_CONFIG: linux_64_libhwloc2 - linux_64_libhwloc2.10.0: - CONFIG: linux_64_libhwloc2.10.0 + linux_ppc64le_libhwloc1: + CONFIG: linux_ppc64le_libhwloc1 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - SHORT_CONFIG: linux_64_libhwloc2.10.0 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 + SHORT_CONFIG: linux_ppc64le_libhwloc1 linux_ppc64le_libhwloc2: CONFIG: linux_ppc64le_libhwloc2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 SHORT_CONFIG: linux_ppc64le_libhwloc2 - linux_ppc64le_libhwloc2.10.0: - CONFIG: linux_ppc64le_libhwloc2.10.0 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 - SHORT_CONFIG: linux_ppc64le_libhwloc2.10.0 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ca2c7a4..5714647 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,14 +8,14 @@ jobs: vmImage: macOS-12 strategy: matrix: + osx_64_libhwloc1: + CONFIG: osx_64_libhwloc1 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_libhwloc1 osx_64_libhwloc2: CONFIG: osx_64_libhwloc2 UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_libhwloc2 - osx_64_libhwloc2.10.0: - CONFIG: osx_64_libhwloc2.10.0 - UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_libhwloc2.10.0 osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_libhwloc2.10.0.yaml b/.ci_support/linux_64_libhwloc1.yaml similarity index 97% rename from .ci_support/linux_64_libhwloc2.10.0.yaml rename to .ci_support/linux_64_libhwloc1.yaml index f4cb485..18a23df 100644 --- a/.ci_support/linux_64_libhwloc2.10.0.yaml +++ b/.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/.ci_support/linux_aarch64_libhwloc2.10.0.yaml b/.ci_support/linux_aarch64_libhwloc1.yaml similarity index 97% rename from .ci_support/linux_aarch64_libhwloc2.10.0.yaml rename to .ci_support/linux_aarch64_libhwloc1.yaml index ad7c61e..b3bc421 100644 --- a/.ci_support/linux_aarch64_libhwloc2.10.0.yaml +++ b/.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/.ci_support/linux_ppc64le_libhwloc2.10.0.yaml b/.ci_support/linux_ppc64le_libhwloc1.yaml similarity index 97% rename from .ci_support/linux_ppc64le_libhwloc2.10.0.yaml rename to .ci_support/linux_ppc64le_libhwloc1.yaml index 7eb5b1f..79da175 100644 --- a/.ci_support/linux_ppc64le_libhwloc2.10.0.yaml +++ b/.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 deleted file mode 100644 index 98ba179..0000000 --- a/.ci_support/migrations/libhwloc2100.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.10.0 - kind: version - migration_number: 1 -libhwloc: -- 2.10.0 -migrator_ts: 1711507406.8423882 diff --git a/.ci_support/osx_64_libhwloc2.10.0.yaml b/.ci_support/osx_64_libhwloc1.yaml similarity index 97% rename from .ci_support/osx_64_libhwloc2.10.0.yaml rename to .ci_support/osx_64_libhwloc1.yaml index bb22d16..198780a 100644 --- a/.ci_support/osx_64_libhwloc2.10.0.yaml +++ b/.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 index d9e8126..1b7175b 100644 --- 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 index 7657ca2..1b5441e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,12 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_libhwloc2 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 + - env: CONFIG=linux_aarch64_libhwloc1 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_libhwloc2.10.0 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 + - env: CONFIG=linux_aarch64_libhwloc2 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 os: linux arch: arm64 dist: focal diff --git a/README.md b/README.md index 7ba9d2c..2155048 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,13 @@ Current build status + + + - + @@ -59,10 +66,10 @@ Current build status - + @@ -73,10 +80,10 @@ Current build status - + @@ -86,13 +93,6 @@ Current build status variant - - -
VariantStatus
linux_64_libhwloc1 + + variant + +
linux_64_libhwloc2 @@ -45,10 +52,10 @@ Current build status
linux_64_libhwloc2.10.0linux_aarch64_libhwloc1 - variant + variant
linux_aarch64_libhwloc2.10.0linux_ppc64le_libhwloc1 - variant + variant
linux_ppc64le_libhwloc2.10.0osx_64_libhwloc1 - variant + variant
osx_64_libhwloc2.10.0 - - variant - -
osx_arm64 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2b97a55..22a55bf 100644 --- 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 new file mode 100644 index 0000000..3e848e9 --- /dev/null +++ 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) + {