Skip to content

Commit f19052c

Browse files
authored
5.0 Beta 1 Release (#1205)
* 5.0 Beta 1 Release * Update docker image * Update conda path * Remove old test job from CI
1 parent 6ec26d2 commit f19052c

File tree

310 files changed

+67846
-85564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+67846
-85564
lines changed

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ cmake_install.cmake
1010
/deps/protobuf/cmake/coremltools.build/
1111
/mlmodel/coremltools.build/
1212
/build/
13+
/envs/
1314
/docs/_build/
1415
/docs/generated/
15-
/coremltools.egg-info/
16+
/*.egg-info/
1617
/dist/
1718
/envs/
1819
.DS_Store
19-
*.xcodeproj/
20-
mlmodel_test_runner
20+
.vscode/
21+
.cache/
2122
.idea/
2223
*.log

.gitlab-ci.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ check_python_flake8:
3131
- docker
3232
stage: build
3333
script:
34-
- export PATH=$PATH:$HOME/miniconda3/condabin
34+
- export PATH=$PATH:/opt/anaconda/bin/
3535
- zsh -e scripts/build.sh --num-procs=4 --python=$PYTHON --dist
3636
artifacts:
3737
expire_in: 2 weeks
@@ -40,25 +40,25 @@ check_python_flake8:
4040

4141
build_wheel_linux_py35:
4242
<<: *build_linux
43-
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
43+
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.2
4444
variables:
4545
PYTHON: "3.5"
4646

4747
build_wheel_linux_py36:
4848
<<: *build_linux
49-
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
49+
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.2
5050
variables:
5151
PYTHON: "3.6"
5252

5353
build_wheel_linux_py37:
5454
<<: *build_linux
55-
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
55+
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.2
5656
variables:
5757
PYTHON: "3.7"
5858

5959
build_wheel_linux_py38:
6060
<<: *build_linux
61-
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
61+
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.2
6262
variables:
6363
PYTHON: "3.8"
6464

@@ -135,7 +135,6 @@ test_macos11_py37_coremltools_test:
135135
changes:
136136
- coremltools/test/**/*.{py}
137137
- coremltools/models/**/*.{py}
138-
- coremltools/converters/caffe/**/*.{py}
139138
- coremltools/converters/keras/**/*.{py}
140139
- coremltools/converters/libsvm/**/*.{py}
141140
- coremltools/converters/sklearn/**/*.{py}
@@ -233,14 +232,31 @@ test_macos10_15_py38_coremltools_smoke_test:
233232
TEST_PACKAGE: coremltools.test.neural_network.test_simple_nn_inference
234233
PYTHON: "3.8"
235234

236-
test_macos10_14_py38_coremltools_smoke_test:
235+
#########################################################################
236+
##
237+
## macOS - Smoke Test on older versions
238+
##
239+
#########################################################################
240+
241+
test_macos11_py38_coremltools_smoke_test:
242+
<<: *test_macos_pkg
243+
tags:
244+
- macos11
245+
dependencies:
246+
- build_wheel_macos_py38
247+
variables:
248+
WHEEL_PATH: build/dist/*cp38*10_16*
249+
TEST_PACKAGE: coremltools.test.neural_network.test_simple_nn_inference
250+
PYTHON: "3.8"
251+
252+
test_macos10_15_py38_coremltools_smoke_test:
237253
<<: *test_macos_pkg
238254
tags:
239-
- macos10.14
255+
- macos10.15
240256
dependencies:
241257
- build_wheel_macos_py38
242258
variables:
243-
WHEEL_PATH: build/dist/*cp38*10_14*
259+
WHEEL_PATH: build/dist/*cp38*10_15*
244260
TEST_PACKAGE: coremltools.test.neural_network.test_simple_nn_inference
245261
PYTHON: "3.8"
246262

@@ -253,7 +269,7 @@ build_documentation:
253269
tags:
254270
- docker
255271
stage: test
256-
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
272+
image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-20.04:1.0.0
257273
script:
258274
- bash -e scripts/build_docs.sh --wheel-path=${WHEEL_PATH} --python=${PYTHON}
259275
dependencies:

0 commit comments

Comments
 (0)