From 98caef6002ca2f1ea619e35e84e985e45d033079 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 6 Aug 2021 04:00:38 -0700 Subject: [PATCH 1/4] make sure packages have unique build strings for cross compiling --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3adb52f3..24c4f0ef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set version = "3.9.0" %} # if build_num is reset to 0 (for new version), update increment for blas_minor below -{% set build_num = 10 %} +{% set build_num = 11 %} {% set version_major = version.split(".")[0] %} # blas_major denotes major infrastructural change to how blas is managed {% set blas_major = "2" %} @@ -52,7 +52,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_{{ blas_impl }}" + string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("libblas", max_pin="x") }} track_features: @@ -90,7 +90,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_{{ blas_impl }}" + string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("libcblas", max_pin="x") }} track_features: @@ -121,7 +121,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_{{ blas_impl }}" + string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("liblapack", max_pin="x.x") }} track_features: @@ -151,7 +151,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_{{ blas_impl }}" + string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("liblapacke", max_pin="x.x") }} track_features: @@ -184,7 +184,7 @@ outputs: # uses lapack {{ version }}, not {{ blas_major }} script: install_blas_devel.sh # [unix] build: - string: "{{ build_num }}_{{ blas_impl }}" + string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" requirements: host: - openblas # [blas_impl == "openblas"] From 51ee509cf3087ac9cabc18e2624f9c3319f4d594 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Aug 2021 14:25:17 +0530 Subject: [PATCH 2/4] Update meta.yaml --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 24c4f0ef..dfb316a4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,7 +52,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("libblas", max_pin="x") }} track_features: @@ -90,7 +90,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("libcblas", max_pin="x") }} track_features: @@ -121,7 +121,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("liblapack", max_pin="x.x") }} track_features: @@ -151,7 +151,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("liblapacke", max_pin="x.x") }} track_features: @@ -184,7 +184,7 @@ outputs: # uses lapack {{ version }}, not {{ blas_major }} script: install_blas_devel.sh # [unix] build: - string: "{{ build_num }}_h{{ PKG_HASH }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" requirements: host: - openblas # [blas_impl == "openblas"] From f480e2932be168b0ffc03d46e894d8d26b174d4e Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Aug 2021 14:30:40 +0530 Subject: [PATCH 3/4] Update meta.yaml --- recipe/meta.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dfb316a4..22d9e527 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,6 +7,8 @@ # make sure we do not create colliding version strings of output "blas" # for builds across lapack-versions within the same blas_major {% set blas_minor = build_num + 100 %} +{% set build_string_platform = target_platform | "linux-64" %} +{% set build_string_platform = build_string_platform.replace("-", "") %} package: name: blas-split @@ -52,7 +54,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ build_string_platform }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("libblas", max_pin="x") }} track_features: @@ -90,7 +92,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ build_string_platform }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("libcblas", max_pin="x") }} track_features: @@ -121,7 +123,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ build_string_platform }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("liblapack", max_pin="x.x") }} track_features: @@ -151,7 +153,7 @@ outputs: script: build_pkg.sh # [unix] script: build_pkg.bat # [win] build: - string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ build_string_platform }}_{{ blas_impl }}" run_exports: - {{ pin_subpackage("liblapacke", max_pin="x.x") }} track_features: @@ -184,7 +186,7 @@ outputs: # uses lapack {{ version }}, not {{ blas_major }} script: install_blas_devel.sh # [unix] build: - string: "{{ build_num }}_{{ target_platform.replace("-", "") }}_{{ blas_impl }}" + string: "{{ build_num }}_{{ build_string_platform }}_{{ blas_impl }}" requirements: host: - openblas # [blas_impl == "openblas"] From 4e0a9ff792dc7fae185726a65d376907d0eea31a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 10 Aug 2021 14:31:28 +0530 Subject: [PATCH 4/4] default --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 22d9e527..c2685308 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ # make sure we do not create colliding version strings of output "blas" # for builds across lapack-versions within the same blas_major {% set blas_minor = build_num + 100 %} -{% set build_string_platform = target_platform | "linux-64" %} +{% set build_string_platform = target_platform | default("linux-64") %} {% set build_string_platform = build_string_platform.replace("-", "") %} package: