5.0 Beta 1 Release (apple#1205)

* 5.0 Beta 1 Release * Update docker image * Update conda path * Remove old test job from CI
RobertRiachi · Jun 8, 2021 · f19052c · f19052c
1 parent 6ec26d2
commit f19052c
Show file tree

Hide file tree

Showing 310 changed files with 67,846 additions and 85,564 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,13 +10,14 @@ cmake_install.cmake
 /deps/protobuf/cmake/coremltools.build/
 /mlmodel/coremltools.build/
 /build/
+/envs/
 /docs/_build/
 /docs/generated/
-/coremltools.egg-info/
+/*.egg-info/
 /dist/
 /envs/
 .DS_Store
-*.xcodeproj/
-mlmodel_test_runner
+.vscode/
+.cache/
 .idea/
 *.log
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ check_python_flake8:
     - docker
   stage: build
   script:
-    - export PATH=$PATH:$HOME/miniconda3/condabin
+    - export PATH=$PATH:/opt/anaconda/bin/
     - zsh -e scripts/build.sh --num-procs=4 --python=$PYTHON --dist
   artifacts:
     expire_in: 2 weeks
@@ -40,25 +40,25 @@ check_python_flake8:
 
 build_wheel_linux_py35:
   <<: *build_linux
-  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
+  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.2
   variables:
     PYTHON: "3.5"
 
 build_wheel_linux_py36:
   <<: *build_linux
-  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
+  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.2
   variables:
     PYTHON: "3.6"
 
 build_wheel_linux_py37:
   <<: *build_linux
-  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
+  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.2
   variables:
     PYTHON: "3.7"
 
 build_wheel_linux_py38:
   <<: *build_linux
-  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
+  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.2
   variables:
     PYTHON: "3.8"
 
@@ -135,7 +135,6 @@ test_macos11_py37_coremltools_test:
     changes:
       - coremltools/test/**/*.{py}
       - coremltools/models/**/*.{py}
-      - coremltools/converters/caffe/**/*.{py}
       - coremltools/converters/keras/**/*.{py}
       - coremltools/converters/libsvm/**/*.{py}
       - coremltools/converters/sklearn/**/*.{py}
@@ -233,14 +232,31 @@ test_macos10_15_py38_coremltools_smoke_test:
     TEST_PACKAGE: coremltools.test.neural_network.test_simple_nn_inference
     PYTHON: "3.8"
 
-test_macos10_14_py38_coremltools_smoke_test:
+#########################################################################
+##
+##                macOS - Smoke Test on older versions
+##
+#########################################################################
+
+test_macos11_py38_coremltools_smoke_test:
+  <<: *test_macos_pkg
+  tags:
+    - macos11
+  dependencies:
+    - build_wheel_macos_py38
+  variables:
+    WHEEL_PATH: build/dist/*cp38*10_16*
+    TEST_PACKAGE: coremltools.test.neural_network.test_simple_nn_inference
+    PYTHON: "3.8"
+
+test_macos10_15_py38_coremltools_smoke_test:
   <<: *test_macos_pkg
   tags:
-    - macos10.14
+    - macos10.15
   dependencies:
     - build_wheel_macos_py38
   variables:
-    WHEEL_PATH: build/dist/*cp38*10_14*
+    WHEEL_PATH: build/dist/*cp38*10_15*
     TEST_PACKAGE: coremltools.test.neural_network.test_simple_nn_inference
     PYTHON: "3.8"
 
@@ -253,7 +269,7 @@ build_documentation:
   tags:
     - docker
   stage: test
-  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
+  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.0
   script:
     - bash -e scripts/build_docs.sh --wheel-path=${WHEEL_PATH} --python=${PYTHON}
   dependencies: