From af480801d00ec333dd584a6ae1fb75133dd167a3 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 20 Oct 2022 17:09:05 -0500 Subject: [PATCH 1/5] Clean up and address review comments. --- recipe/meta.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cbc8ffc..437c814 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,7 @@ {% set nvidia_cub_git_hash = "0158fa19f28619886232defd412433974af89611" %} {% set nvidia_cub_sha_hash = "43424c4c17a997d1d730c89ec14688671245de7941e02b388d7d3df6ea53777a" %} +# This are future/2.x variables. #{% set onednn_git_hash = "58be3660fb57c4c4a3d306730e849237d1271572" %} #{% set onednn_sha_hash = "0d170c30ea0a35fbe48008e0e7e729d0993720c14f320ce8e73a891ae176eec4" %} @@ -42,7 +43,6 @@ source: - patches/0001-cpp-std-14.patch - patches/0001-make-graphviz-optional.patch - patches/0002-conda-unbundle-libmxnet-DSO.patch - # - patches/0002-cpu-fix.patch - url: https://github.com/dmlc/dlpack/archive/{{ dlpack_git_hash }}.tar.gz fn: dlpack_{{ dlpack_git_hash }}.tar.gz @@ -60,8 +60,6 @@ source: fn: googletest_{{ googletest_git_hash }}.tar.gz sha256: {{ googletest_sha_hash }} folder: 3rdparty/googletest -# patches: -# - patches/0031-cpp-std-14.patch - url: https://github.com/kpu/intgemm/archive/{{ intgemm_git_hash }}.tar.gz fn: intgemm_{{ intgemm_git_hash }}.tar.gz @@ -74,13 +72,12 @@ source: fn: nvidia_cub_{{ nvidia_cub_git_hash }}.tar.gz sha256: {{ nvidia_cub_sha_hash }} folder: 3rdparty/nvidia_cub -# patches: -# - patches/0051-cpp-std-14.patch -# - url: https://github.com/oneapi-src/oneDNN/archive/{{ onednn_git_hash }}.tar.gz -# fn: onednn_{{ onednn_git_hash }}.tar.gz -# sha256: {{ onednn_sha_hash }} -# folder: 3rdparty/onednn + # This will be useful for 2.x builds + # - url: https://github.com/oneapi-src/oneDNN/archive/{{ onednn_git_hash }}.tar.gz + # fn: onednn_{{ onednn_git_hash }}.tar.gz + # sha256: {{ onednn_sha_hash }} + # folder: 3rdparty/onednn - url: https://github.com/onnx/onnx-tensorrt/archive/{{ onnxtensorrt_git_hash }}.tar.gz fn: onnx-tensorrt_{{ onnxtensorrt_git_hash }}.tar.gz @@ -91,15 +88,11 @@ source: fn: ps-lite_{{ pslite_git_hash }}.tar.gz sha256: {{ pslite_sha_hash }} folder: 3rdparty/ps-lite -# patches: -# - patches/0081-cpp-std-14.patch - url: https://github.com/apache/incubator-tvm/archive/{{ tvm_git_hash }}.tar.gz fn: tvm_{{ tvm_git_hash }}.tar.gz sha256: {{ tvm_sha_hash }} folder: 3rdparty/tvm -# patches: -# - patches/0091-cpp-std-14.patch # Right now there is no valid win-64 configuration (no mkl). So skip it. We are mxnet_blas_impl as a workaround for conda. @@ -124,8 +117,10 @@ outputs: number: {{ build_number }} about: + home: https://mxnet.apache.org summary: Mutex package to pin a variant of MXNet Conda package - + dev_url: https://github.com/apache/incubator-mxnet + doc_url: https://mxnet.incubator.apache.org/ - name: libmxnet version: {{ mxnet_version }} @@ -260,8 +255,10 @@ outputs: - {{ pin_subpackage('py-mxnet', exact=True) }} about: + home: https://mxnet.apache.org summary: MXNet metapackage for installing lib,py-MXNet Conda packages - + dev_url: https://github.com/apache/incubator-mxnet + doc_url: https://mxnet.incubator.apache.org/ - name: mxnet-{{ mxnet_variant_str }} version: {{ mxnet_version }} @@ -275,8 +272,10 @@ outputs: - {{ pin_subpackage('_mutex_mxnet', exact=True) }} about: + home: https://mxnet.apache.org summary: MXNet metapackage which pins a variant of MXNet Conda package - + dev_url: https://github.com/apache/incubator-mxnet + doc_url: https://mxnet.incubator.apache.org/ - name: mxnet-gpu version: {{ mxnet_version }} @@ -294,7 +293,8 @@ outputs: about: home: https://mxnet.apache.org summary: MXNet metapackage which pins a variant of MXNet(GPU) Conda package - + dev_url: https://github.com/apache/incubator-mxnet + doc_url: https://mxnet.incubator.apache.org/ extra: recipe-maintainers: From efb3e2e0dedfbbfab40226fc8b80e7c0d9fa52d1 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 21 Oct 2022 09:30:39 +0200 Subject: [PATCH 2/5] add missing empty build scriptipts --- recipe/meta.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 437c814..105b67b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -208,7 +208,7 @@ outputs: - cython - python # Numpy's C API is not used - - numpy >1.16.0,<=2.0.0 + - numpy - requests >=2.20.0,<3 - setuptools run: @@ -245,6 +245,8 @@ outputs: - name: mxnet version: {{ mxnet_version }} + script: build-nothing.bat # [win] + script: build-nothing.sh # [not win] build: number: {{ build_number }} @@ -262,6 +264,8 @@ outputs: - name: mxnet-{{ mxnet_variant_str }} version: {{ mxnet_version }} + script: build-nothing.bat # [win] + script: build-nothing.sh # [not win] #build: #number: {{ build_number }} @@ -279,6 +283,8 @@ outputs: - name: mxnet-gpu version: {{ mxnet_version }} + script: build-nothing.bat # [win] + script: build-nothing.sh # [not win] build: #number: {{ build_number }} From 807336388de55a75a9bf96005d25e114102bc419 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 21 Oct 2022 10:38:06 +0200 Subject: [PATCH 3/5] meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 105b67b..c868da6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -134,7 +134,7 @@ outputs: missing_dso_whitelist: # [linux] - libcuda.so.1 # [linux] - '$RPATH/ld64.so.1' # [s390x] This is missing from the activation script. - + - '**libmxnet.dylib' # [osx] This is a quirk in conda-build's testing requirements: build: - {{ compiler('c') }} From fc9f314518ed7598bbc530d481fc81233a27c720 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 21 Oct 2022 10:44:22 +0200 Subject: [PATCH 4/5] work-a-round quirk in conda-build's lib-check algo --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c868da6..0194115 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -133,8 +133,8 @@ outputs: skip: True # [win and vc<14] missing_dso_whitelist: # [linux] - libcuda.so.1 # [linux] - - '$RPATH/ld64.so.1' # [s390x] This is missing from the activation script. - - '**libmxnet.dylib' # [osx] This is a quirk in conda-build's testing + - '$RPATH/ld64.so.1' # [linux] + - '*/libmxnet.dylib' # [osx] requirements: build: - {{ compiler('c') }} From 5427b838998d4533368627ba9db3e0173d9ee429 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 21 Oct 2022 10:49:29 +0200 Subject: [PATCH 5/5] work-a-round quirk in conda-build's lib-check algo --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0194115..ca73a04 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -131,10 +131,11 @@ outputs: string: {{ mxnet_variant_str }}_h{{PKG_HASH}}_{{ build_number }} number: {{ build_number }} skip: True # [win and vc<14] - missing_dso_whitelist: # [linux] + missing_dso_whitelist: # [linux or osx] - libcuda.so.1 # [linux] - '$RPATH/ld64.so.1' # [linux] - '*/libmxnet.dylib' # [osx] + requirements: build: - {{ compiler('c') }}