From 64cf6490d479dbc04ee17b4ac5256395a7e6b86c Mon Sep 17 00:00:00 2001 From: Nishidha Panpaliya Date: Wed, 12 Feb 2020 09:41:37 +0000 Subject: [PATCH 01/12] Clean recipe for mxnet --- .travis.yml | 16 +- .../.ci_support/linux_ppc64le_python3.6.yaml | 16 ++ .../.ci_support/linux_ppc64le_python3.7.yaml | 16 ++ conda-recipes/mxnet-feedstock/LICENSE | 175 ++++++++++++++++++ conda-recipes/mxnet-feedstock/README.md | 10 + .../mxnet-feedstock/ci_support/build_steps.sh | 49 +++++ .../ci_support/run_docker_build.sh | 62 +++++++ .../recipe/0001-cuda-stubs-conda-env.patch | 12 ++ .../0002-move-requirements-to-meta-yaml.patch | 11 ++ conda-recipes/mxnet-feedstock/recipe/build.sh | 22 +++ .../mxnet-feedstock/recipe/meta.yaml | 68 +++++++ 11 files changed, 444 insertions(+), 13 deletions(-) create mode 100644 conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml create mode 100644 conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml create mode 100644 conda-recipes/mxnet-feedstock/LICENSE create mode 100644 conda-recipes/mxnet-feedstock/README.md create mode 100755 conda-recipes/mxnet-feedstock/ci_support/build_steps.sh create mode 100755 conda-recipes/mxnet-feedstock/ci_support/run_docker_build.sh create mode 100644 conda-recipes/mxnet-feedstock/recipe/0001-cuda-stubs-conda-env.patch create mode 100644 conda-recipes/mxnet-feedstock/recipe/0002-move-requirements-to-meta-yaml.patch create mode 100644 conda-recipes/mxnet-feedstock/recipe/build.sh create mode 100644 conda-recipes/mxnet-feedstock/recipe/meta.yaml diff --git a/.travis.yml b/.travis.yml index 28e10ff..f06113e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,27 +24,17 @@ env: matrix: include: - - env: CONFIG=linux_ppc64le_python3.6 UPLOAD_PACKAGES=True DOCKER_IMAGE=ibmcom/powerai:1.6.2-pytorch-ubuntu18.04-py36-ppc64le + - env: CONFIG=linux_ppc64le_python3.6 UPLOAD_PACKAGES=True DOCKER_IMAGE=ibmcom/powerai:1.6.2-tensorflow-ubuntu18.04-py36 os: linux-ppc64le arch: ppc64le language: generic - - env: CONFIG=linux_ppc64le_python3.7 UPLOAD_PACKAGES=True DOCKER_IMAGE=ibmcom/powerai:1.6.2-pytorch-ubuntu18.04-py37-ppc64le + - env: CONFIG=linux_ppc64le_python3.7 UPLOAD_PACKAGES=True DOCKER_IMAGE=ibmcom/powerai:1.6.2-tensorflow-ubuntu18.04-py37 os: linux-ppc64le arch: ppc64le language: generic - - env: CONFIG=linux_python3.6 UPLOAD_PACKAGES=True DOCKER_IMAGE=ibmcom/powerai:1.6.2-pytorch-ubuntu18.04-py36-x86_64 - os: linux-64 - arch: amd64 - language: generic - - - env: CONFIG=linux_python3.7 UPLOAD_PACKAGES=True DOCKER_IMAGE=ibmcom/powerai:1.6.2-pytorch-ubuntu18.04-py37-x86_64 - os: linux-64 - arch: amd64 - language: generic - script: - - cd conda-recipes/fairseq-feedstock + - cd conda-recipes/mxnet-feedstock - "travis_wait 60 sleep 3600 &" - ./ci_support/run_docker_build.sh diff --git a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml new file mode 100644 index 0000000..bf19bd4 --- /dev/null +++ b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml @@ -0,0 +1,16 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' +channel_sources: +- defaults,conda-forge +channel_targets: +- powerai main +docker_image: +- ibmcom/powerai:1.6.2-tensorflow-ubuntu18.04-py36 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml new file mode 100644 index 0000000..7f95b7a --- /dev/null +++ b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml @@ -0,0 +1,16 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' +channel_sources: +- defaults,conda-forge +channel_targets: +- powerai main +docker_image: +- ibmcom/powerai:1.6.2-tensorflow-ubuntu18.04-py37 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' diff --git a/conda-recipes/mxnet-feedstock/LICENSE b/conda-recipes/mxnet-feedstock/LICENSE new file mode 100644 index 0000000..e97bf01 --- /dev/null +++ b/conda-recipes/mxnet-feedstock/LICENSE @@ -0,0 +1,175 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + diff --git a/conda-recipes/mxnet-feedstock/README.md b/conda-recipes/mxnet-feedstock/README.md new file mode 100644 index 0000000..107ad68 --- /dev/null +++ b/conda-recipes/mxnet-feedstock/README.md @@ -0,0 +1,10 @@ +# MXNet GPU python package (MXNet library and python bindings to it) +https://github.com/apache/incubator-mxnet + +Package license: Apache-2.0 + +Feedstock license: Apache-2.0 + +Summary: Apache MXNet + +Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler; for Python, R, Julia, Scala, Go, Javascript and more diff --git a/conda-recipes/mxnet-feedstock/ci_support/build_steps.sh b/conda-recipes/mxnet-feedstock/ci_support/build_steps.sh new file mode 100755 index 0000000..a855147 --- /dev/null +++ b/conda-recipes/mxnet-feedstock/ci_support/build_steps.sh @@ -0,0 +1,49 @@ +# (C) Copyright IBM Corp. 2018, 2019. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#!/usr/bin/env bash + +set -xeuo pipefail +export PYTHONUNBUFFERED=1 +export FEEDSTOCK_ROOT=/home/conda/feedstock_root +export RECIPE_ROOT=/home/conda/recipe_root +export CI_SUPPORT=/home/conda/feedstock_root/.ci_support +export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" +export PATH=/opt/anaconda/bin:$PATH +cat >~/.condarc </dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" + +FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe + +docker info + +# In order for the conda-build process in the container to write to the mounted +# volumes, we need to run with the same id as the host machine, which is +# normally the owner of the mounted volumes, or at least has write permission +export HOST_USER_ID=$(id -u) +# Check if docker-machine is being used (normally on OSX) and get the uid from +# the VM +if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then + HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + +ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" +mkdir -p "$ARTIFACTS" +DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +rm -f "$DONE_CANARY" + +# Enable running in interactive mode ONLY if attached to a tty, +# so "-t" is made conditional +test -t 1 && USE_TTY="-t" +DOCKER_RUN_ARGS=" -i ${USE_TTY} " + +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -e CONFIG \ + -e BINSTAR_TOKEN \ + -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ + -e CI \ + -a stdin -a stdout -a stderr \ + ${DOCKER_IMAGE} \ + bash \ + /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + +# double-check that the build got to the end +# see https://github.com/conda-forge/conda-smithy/pull/337 +# for a possible fix + +test -f "$DONE_CANARY" diff --git a/conda-recipes/mxnet-feedstock/recipe/0001-cuda-stubs-conda-env.patch b/conda-recipes/mxnet-feedstock/recipe/0001-cuda-stubs-conda-env.patch new file mode 100644 index 0000000..ebd8a73 --- /dev/null +++ b/conda-recipes/mxnet-feedstock/recipe/0001-cuda-stubs-conda-env.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -494,7 +494,7 @@ + endif + # Make sure to add stubs as fallback in order to be able to build + # without full CUDA install (especially if run without nvidia-docker) +- LDFLAGS += -L/usr/local/cuda/lib64/stubs ++ LDFLAGS += -L$(CUDA_LIBRARY_PATH) + ifeq ($(USE_NCCL), 1) + ifneq ($(USE_NCCL_PATH), NONE) + CFLAGS += -I$(USE_NCCL_PATH)/include diff --git a/conda-recipes/mxnet-feedstock/recipe/0002-move-requirements-to-meta-yaml.patch b/conda-recipes/mxnet-feedstock/recipe/0002-move-requirements-to-meta-yaml.patch new file mode 100644 index 0000000..0771989 --- /dev/null +++ b/conda-recipes/mxnet-feedstock/recipe/0002-move-requirements-to-meta-yaml.patch @@ -0,0 +1,11 @@ +diff --git a/python/setup.py b/python/setup.py +--- a/python/setup.py ++++ b/python/setup.py +@@ -30,7 +30,6 @@ if "--inplace" in sys.argv: + else: + from setuptools import setup + from setuptools.extension import Extension +- kwargs = {'install_requires': ['numpy>1.16.0,<2.0.0', 'requests>=2.20.0,<3', 'graphviz<0.9.0,>=0.8.1'], 'zip_safe': False} + + with_cython = False + if '--with-cython' in sys.argv: diff --git a/conda-recipes/mxnet-feedstock/recipe/build.sh b/conda-recipes/mxnet-feedstock/recipe/build.sh new file mode 100644 index 0000000..80c0178 --- /dev/null +++ b/conda-recipes/mxnet-feedstock/recipe/build.sh @@ -0,0 +1,22 @@ +# (C) Copyright IBM Corp. 2018, 2019. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#!/bin/bash + +set -vex + +make -j $(nproc) USE_OPENCV=1 USE_BLAS=openblas USE_CUDA=1 USE_CUDNN=1 USE_PROFILER=1 CUDA_LIBRARY_PATH="${PREFIX}/lib/stubs" + +cd python +${PYTHON} setup.py install diff --git a/conda-recipes/mxnet-feedstock/recipe/meta.yaml b/conda-recipes/mxnet-feedstock/recipe/meta.yaml new file mode 100644 index 0000000..03d0fd9 --- /dev/null +++ b/conda-recipes/mxnet-feedstock/recipe/meta.yaml @@ -0,0 +1,68 @@ +# This is the recipe for the GPU version of mxnet + +{% set version = "1.5.1" %} + +package: + name: mxnet + version: {{ version }} + +source: + patches: + - 0001-cuda-stubs-conda-env.patch + - 0002-move-requirements-to-meta-yaml.patch + url: https://github.com/apache/incubator-mxnet/releases/download/{{ version }}/apache-mxnet-src-{{ version }}-incubating.tar.gz + +build: + script_env: + - IBM_POWERAI_LICENSE_ACCEPT + +requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - make + host: + - libopencv + - libopenblas + - openblas-devel + - liblapack + - libtiff + - python + - cython + - numpy + - requests + - setuptools + - cudatoolkit + - cudatoolkit-dev + - cudnn + run: + - numpy >=1.16.0,<=2.0.0 + - requests >=2.20.0,<3 + - python + - libopencv + - cudatoolkit + - cudnn + +test: + imports: + - mxnet + +about: + home: http://mxnet.io + license: Apache-2 + license_file: LICENSE + license_family: Apache + summary: MXNet is a deep learning framework designed for both efficiency and flexibility + description: | + Apache MXNet (incubating) is a deep learning framework designed for both + efficiency and flexibility. It allows you to mix symbolic and imperative + programming to maximize efficiency and productivity. At its core, MXNet + contains a dynamic dependency scheduler that automatically parallelizes both + symbolic and imperative operations on the fly. A graph optimization layer on + top of that makes symbolic execution fast and memory efficient. MXNet is + portable and lightweight, scaling effectively to multiple GPUs and multiple + machines. MXNet is also more than a deep learning project. It is also a + collection of blue prints and guidelines for building deep learning systems, + and interesting insights of DL systems for hackers. + dev_url: https://github.com/apache/incubator-mxnet + doc_url: https://mxnet.incubator.apache.org/ From 45b1445c3f6e2fab68f9cf9efb6d521da14ba3d3 Mon Sep 17 00:00:00 2001 From: Nishidha Date: Wed, 12 Feb 2020 15:36:41 +0530 Subject: [PATCH 02/12] Update run_docker_build.sh --- conda-recipes/mxnet-feedstock/ci_support/run_docker_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipes/mxnet-feedstock/ci_support/run_docker_build.sh b/conda-recipes/mxnet-feedstock/ci_support/run_docker_build.sh index 9ba5cb7..8611787 100755 --- a/conda-recipes/mxnet-feedstock/ci_support/run_docker_build.sh +++ b/conda-recipes/mxnet-feedstock/ci_support/run_docker_build.sh @@ -50,7 +50,7 @@ docker run ${DOCKER_RUN_ARGS} \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ -e CI \ - -a stdin -a stdout -a stderr \ + -a stdin -a stdout -a stderr -u root \ ${DOCKER_IMAGE} \ bash \ /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh From 116c100469ca26e8679ce18c73f8b57e448c65e7 Mon Sep 17 00:00:00 2001 From: Nishidha Panpaliya Date: Mon, 17 Feb 2020 10:02:05 +0000 Subject: [PATCH 03/12] Fixd build --- conda-recipes/mxnet-feedstock/recipe/build.sh | 1 + conda-recipes/mxnet-feedstock/recipe/meta.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/conda-recipes/mxnet-feedstock/recipe/build.sh b/conda-recipes/mxnet-feedstock/recipe/build.sh index 80c0178..ada0ff6 100644 --- a/conda-recipes/mxnet-feedstock/recipe/build.sh +++ b/conda-recipes/mxnet-feedstock/recipe/build.sh @@ -16,6 +16,7 @@ set -vex +ln -s $BUILD_PREFIX/bin/powerpc64le-conda_cos7-linux-gnu-gcc-ar $BUILD_PREFIX/bin/ar make -j $(nproc) USE_OPENCV=1 USE_BLAS=openblas USE_CUDA=1 USE_CUDNN=1 USE_PROFILER=1 CUDA_LIBRARY_PATH="${PREFIX}/lib/stubs" cd python diff --git a/conda-recipes/mxnet-feedstock/recipe/meta.yaml b/conda-recipes/mxnet-feedstock/recipe/meta.yaml index 03d0fd9..f2d1a77 100644 --- a/conda-recipes/mxnet-feedstock/recipe/meta.yaml +++ b/conda-recipes/mxnet-feedstock/recipe/meta.yaml @@ -35,12 +35,14 @@ requirements: - cudatoolkit - cudatoolkit-dev - cudnn + - pkg-config run: - numpy >=1.16.0,<=2.0.0 - requests >=2.20.0,<3 - python - libopencv - cudatoolkit + - cudatoolkit-dev - cudnn test: From 72ed1d898b6aa5f5f5f10c4253a8f6d3d8135524 Mon Sep 17 00:00:00 2001 From: Nishidha Date: Wed, 29 Apr 2020 21:53:57 +0530 Subject: [PATCH 04/12] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d37fc7..3ba2bf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,4 +42,4 @@ matrix: script: - cd conda-recipes/mxnet-feedstock - "travis_wait 60 sleep 3600 &" - - ./conda-recipes/build_scripts/run_docker_build.sh pycox-feedstock + - ./conda-recipes/build_scripts/run_docker_build.sh mxnet-feedstock From bcbd7f293dffc4aa21eba44150c6ac33bfb0af44 Mon Sep 17 00:00:00 2001 From: Nishidha Date: Thu, 30 Apr 2020 18:10:50 +0530 Subject: [PATCH 05/12] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ba2bf6..3770507 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,5 @@ matrix: language: generic script: - - cd conda-recipes/mxnet-feedstock - "travis_wait 60 sleep 3600 &" - ./conda-recipes/build_scripts/run_docker_build.sh mxnet-feedstock From cd12ee50052dcb97c9fea739822ada22c95acdb9 Mon Sep 17 00:00:00 2001 From: Nishidha Panpaliya Date: Tue, 5 May 2020 12:32:27 +0000 Subject: [PATCH 06/12] Added some debug statements --- conda-recipes/build_scripts/build_steps.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conda-recipes/build_scripts/build_steps.sh b/conda-recipes/build_scripts/build_steps.sh index e4c50dc..133e1c8 100644 --- a/conda-recipes/build_scripts/build_steps.sh +++ b/conda-recipes/build_scripts/build_steps.sh @@ -22,6 +22,10 @@ export CI_SUPPORT=/home/conda/feedstock_root/.ci_support export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" export PATH=/opt/anaconda/bin:$PATH +echo "CURRENT DIR: $(pwd)" +ls $RECIPE_ROOT +find ../ -name 0001-cuda-stubs-conda-env.patch + cat >~/.condarc < Date: Tue, 5 May 2020 14:30:51 +0000 Subject: [PATCH 07/12] Added patch in the requirement section --- conda-recipes/mxnet-feedstock/recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipes/mxnet-feedstock/recipe/meta.yaml b/conda-recipes/mxnet-feedstock/recipe/meta.yaml index f2d1a77..d4ce916 100644 --- a/conda-recipes/mxnet-feedstock/recipe/meta.yaml +++ b/conda-recipes/mxnet-feedstock/recipe/meta.yaml @@ -22,6 +22,7 @@ requirements: - {{ compiler('cxx') }} - make host: + - patch - libopencv - libopenblas - openblas-devel From b2ae7ef438cb97175ac9c98c6704c29fcd0d7558 Mon Sep 17 00:00:00 2001 From: Nishidha Date: Tue, 5 May 2020 22:11:07 +0530 Subject: [PATCH 08/12] Moved patch in build section --- conda-recipes/mxnet-feedstock/recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipes/mxnet-feedstock/recipe/meta.yaml b/conda-recipes/mxnet-feedstock/recipe/meta.yaml index d4ce916..a05cbea 100644 --- a/conda-recipes/mxnet-feedstock/recipe/meta.yaml +++ b/conda-recipes/mxnet-feedstock/recipe/meta.yaml @@ -21,8 +21,8 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - make - host: - patch + host: - libopencv - libopenblas - openblas-devel From a497fb696ca24c82acb1efc5a3540099903bd86e Mon Sep 17 00:00:00 2001 From: Nishidha Date: Tue, 5 May 2020 23:08:44 +0530 Subject: [PATCH 09/12] Reverted the commit done for debugging purpose --- conda-recipes/build_scripts/build_steps.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conda-recipes/build_scripts/build_steps.sh b/conda-recipes/build_scripts/build_steps.sh index 133e1c8..e4c50dc 100644 --- a/conda-recipes/build_scripts/build_steps.sh +++ b/conda-recipes/build_scripts/build_steps.sh @@ -22,10 +22,6 @@ export CI_SUPPORT=/home/conda/feedstock_root/.ci_support export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" export PATH=/opt/anaconda/bin:$PATH -echo "CURRENT DIR: $(pwd)" -ls $RECIPE_ROOT -find ../ -name 0001-cuda-stubs-conda-env.patch - cat >~/.condarc < Date: Wed, 6 May 2020 06:58:11 +0000 Subject: [PATCH 10/12] Adding cmake in the dependency list --- conda-recipes/mxnet-feedstock/recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipes/mxnet-feedstock/recipe/meta.yaml b/conda-recipes/mxnet-feedstock/recipe/meta.yaml index a05cbea..85e65ea 100644 --- a/conda-recipes/mxnet-feedstock/recipe/meta.yaml +++ b/conda-recipes/mxnet-feedstock/recipe/meta.yaml @@ -20,6 +20,7 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} + - cmake - make - patch host: From 8536f74bf41cd493cfb485ac5dd49b0aef085205 Mon Sep 17 00:00:00 2001 From: Nishidha Panpaliya Date: Wed, 6 May 2020 08:27:04 +0000 Subject: [PATCH 11/12] Modified config settings --- .travis.yml | 4 ++-- conda-recipes/build_scripts/local_build.sh | 2 +- .../mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml | 4 ++-- .../mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) mode change 100644 => 100755 conda-recipes/build_scripts/local_build.sh diff --git a/.travis.yml b/.travis.yml index 540f036..06f141b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,12 +30,12 @@ branches: matrix: include: - env: CONFIG=linux_ppc64le_python3.6 UPLOAD_PACKAGES=True DOCKER_IMAGE=ibmcom/powerai:1.7.0-tensorflow-ubuntu18.04-py36 - os: linux-ppc64le + os: linux arch: ppc64le language: generic - env: CONFIG=linux_ppc64le_python3.7 UPLOAD_PACKAGES=True DOCKER_IMAGE=ibmcom/powerai:1.7.0-tensorflow-ubuntu18.04-py37 - os: linux-ppc64le + os: linux arch: ppc64le language: generic diff --git a/conda-recipes/build_scripts/local_build.sh b/conda-recipes/build_scripts/local_build.sh old mode 100644 new mode 100755 index 14b3ed8..80c815c --- a/conda-recipes/build_scripts/local_build.sh +++ b/conda-recipes/build_scripts/local_build.sh @@ -16,7 +16,7 @@ set -xeuo pipefail export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT=$(pwd) +export FEEDSTOCK_ROOT=$(pwd)/../$1 export RECIPE_ROOT=$FEEDSTOCK_ROOT/recipe export CI_SUPPORT=$FEEDSTOCK_ROOT/.ci_support export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" diff --git a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml index bf19bd4..0836023 100644 --- a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml +++ b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml @@ -3,11 +3,11 @@ c_compiler: c_compiler_version: - '7' channel_sources: -- defaults,conda-forge +- https://public.dhe.ibm.com/ibmdl/export/pub/software/server/ibm-ai/conda/,powerai,defaults channel_targets: - powerai main docker_image: -- ibmcom/powerai:1.6.2-tensorflow-ubuntu18.04-py36 +- ibmcom/powerai:1.7.0-tensorflow-ubuntu18.04-py36 pin_run_as_build: python: min_pin: x.x diff --git a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml index 7f95b7a..655d585 100644 --- a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml +++ b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml @@ -3,11 +3,11 @@ c_compiler: c_compiler_version: - '7' channel_sources: -- defaults,conda-forge +- https://public.dhe.ibm.com/ibmdl/export/pub/software/server/ibm-ai/conda/,powerai,defaults channel_targets: - powerai main docker_image: -- ibmcom/powerai:1.6.2-tensorflow-ubuntu18.04-py37 +- ibmcom/powerai:1.7.0-tensorflow-ubuntu18.04-py37 pin_run_as_build: python: min_pin: x.x From 7b4de1d85af3a4c0dd1c86d65980d204180182ab Mon Sep 17 00:00:00 2001 From: Nishidha Panpaliya Date: Wed, 6 May 2020 05:23:52 -0500 Subject: [PATCH 12/12] Added conda-forge back as it is needed for liblapack --- .../mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml | 2 +- .../mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml index 0836023..82a06ac 100644 --- a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml +++ b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.6.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '7' channel_sources: -- https://public.dhe.ibm.com/ibmdl/export/pub/software/server/ibm-ai/conda/,powerai,defaults +- https://public.dhe.ibm.com/ibmdl/export/pub/software/server/ibm-ai/conda/,powerai,defaults,conda-forge channel_targets: - powerai main docker_image: diff --git a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml index 655d585..4edae93 100644 --- a/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml +++ b/conda-recipes/mxnet-feedstock/.ci_support/linux_ppc64le_python3.7.yaml @@ -3,7 +3,7 @@ c_compiler: c_compiler_version: - '7' channel_sources: -- https://public.dhe.ibm.com/ibmdl/export/pub/software/server/ibm-ai/conda/,powerai,defaults +- https://public.dhe.ibm.com/ibmdl/export/pub/software/server/ibm-ai/conda/,powerai,defaults,conda-forge channel_targets: - powerai main docker_image: