Sync for 4.0b4 release (#950)

* sync for 4.0b4 release

* fix extra space character in build.sh and add a simple prediction test for smoke testing on older macs

Author: aseemw

.gitlab-ci.yml

@@ -22,7 +22,7 @@ check_python_flake8:
 
 ########################################################################
 #
-#                         linux - Build & Test
+#                         linux - Build
 #
 ########################################################################
 
@@ -44,9 +44,33 @@ build_wheel_linux_py27:
   variables:
     PYTHON: "2.7"
 
+build_wheel_linux_py35:
+  <<: *build_linux
+  image: registry.gitlab.com/zach_nation/coremltools/build-image-ubuntu-14.04:1.0.3
+  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
+  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
+  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
+  variables:
+    PYTHON: "3.8"
+
 #########################################################################
 ##
-##                         macOS - Build & Test
+##                         macOS - Build
 ##
 #########################################################################
 
@@ -91,6 +115,12 @@ build_wheel_macos_py38:
   variables:
     PYTHON: "3.8"
 
+#########################################################################
+##
+##                         macOS - Test
+##
+#########################################################################
+
 .test_macos_pkg: &test_macos_pkg
   stage: test
   script:
@@ -272,6 +302,45 @@ test_macos11_py37_mil:
       - coremltools/converters/mil/mil/**/*.{py}
       - coremltools/converters/mil/backend/**/*.{py}
 
+#########################################################################
+##
+##                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_macos15_py38_coremltools_smoke_test:
+  <<: *test_macos_pkg
+  tags:
+    - macos10.15
+  dependencies:
+    - build_wheel_macos_py38
+  variables:
+    WHEEL_PATH: build/dist/*cp38*10_15*
+    TEST_PACKAGE: coremltools.test.neural_network.test_simple_nn_inference
+    PYTHON: "3.8"
+
+test_macos14_py38_coremltools_smoke_test:
+  <<: *test_macos_pkg
+  tags:
+    - macos10.14
+  dependencies:
+    - build_wheel_macos_py38
+  variables:
+    WHEEL_PATH: build/dist/*cp38*10_14*
+    TEST_PACKAGE: coremltools.test.neural_network.test_simple_nn_inference
+    PYTHON: "3.8"
+
 #########################################################################
 ##
 ##                        Make docs
@@ -314,6 +383,10 @@ collect_artifacts:
     echo "Collect artifacts (wheels and documentation)"
   dependencies:
     - build_wheel_linux_py27
+    - build_wheel_linux_py35
+    - build_wheel_linux_py36
+    - build_wheel_linux_py37
+    - build_wheel_linux_py38
     - build_wheel_macos_py27
     - build_wheel_macos_py35
     - build_wheel_macos_py36

README.md

@@ -29,7 +29,7 @@ With coremltools, you can do the following:
 To get the latest version of coremltools:
 
 ```shell
-pip install coremltools==4.0b3
+pip install coremltools==4.0b4
 ```
 
 For the latest changes please see the [release notes](https://github.com/apple/coremltools/releases/).

coremlpython/CoreMLPython.h

@@ -51,10 +51,14 @@ namespace CoreML {
                 std::unique_ptr<NNBuffer::NeuralNetworkBuffer> nnBuffer;
 
             public:
-                NeuralNetworkBufferInformation(const std::string& bufferFilePath, NNBuffer::bufferMode mode);
+                NeuralNetworkBufferInformation(const std::string& bufferFilePath, NNBuffer::BufferMode mode);
                 ~NeuralNetworkBufferInformation();
-                std::vector<float> getBuffer(const u_int64_t offset);
-                u_int64_t addBuffer(const std::vector<float>& buffer);
+            
+                template <typename T>
+                u_int64_t addBuffer(const std::vector<T>& buffer);
+            
+                template <typename T>
+                std::vector<T> getBuffer(const u_int64_t offset);
         };
     }
 }

coremlpython/CoreMLPython.mm

@@ -134,7 +134,7 @@
 /*
  * NeuralNetworkBuffer - NeuralNetworkBuffer
  */
-NeuralNetworkBufferInformation::NeuralNetworkBufferInformation(const std::string &bufferFilePath, NNBuffer::bufferMode mode)
+NeuralNetworkBufferInformation::NeuralNetworkBufferInformation(const std::string &bufferFilePath, NNBuffer::BufferMode mode)
     : nnBuffer(std::make_unique<NNBuffer::NeuralNetworkBuffer>(bufferFilePath, mode))
 {
 }
@@ -149,18 +149,20 @@
  * Writes given buffer into file
  * Returns offset from the beginning of buffer
  */
-inline u_int64_t NeuralNetworkBufferInformation::addBuffer(const std::vector<float> &buffer) {
-    return nnBuffer->addBuffer(buffer);
+template <typename T>
+inline u_int64_t NeuralNetworkBufferInformation::addBuffer(const std::vector<T>& buffer) {
+    return nnBuffer->AddBuffer(buffer);
 }
 
 /*
  * NeuralNetworkBufferInformation - getBuffer
  * Reads buffer from given offset and of given size and writes to data
  */
-inline std::vector<float> NeuralNetworkBufferInformation::getBuffer(const u_int64_t offset) {
+template <typename T>
+inline std::vector<T> NeuralNetworkBufferInformation::getBuffer(const u_int64_t offset) {
     // TODO: Explore Pybind11 Opaque to pass vector by reference
-    std::vector<float> buffer;
-    nnBuffer->getBuffer(offset, buffer);
+    std::vector<T> buffer;
+    nnBuffer->GetBuffer(offset, buffer);
     return buffer;
 }
 
@@ -180,13 +182,18 @@
         .def("print", &NeuralNetworkShapeInformation::print);
 
     py::class_<NeuralNetworkBufferInformation> netBuffer(m, "_NeuralNetworkBuffer");
-    netBuffer.def(py::init<const std::string&, NNBuffer::bufferMode>())
-        .def("add_buffer", &NeuralNetworkBufferInformation::addBuffer)
-        .def("get_buffer", &NeuralNetworkBufferInformation::getBuffer);
-    py::enum_<NNBuffer::bufferMode>(netBuffer, "mode")
-        .value("write", NNBuffer::bufferMode::write)
-        .value("append", NNBuffer::bufferMode::append)
-        .value("read", NNBuffer::bufferMode::read)
+    netBuffer.def(py::init<const std::string&, NNBuffer::BufferMode>())
+        .def("add_buffer_float", &NeuralNetworkBufferInformation::addBuffer<float>)
+        .def("add_buffer_int", &NeuralNetworkBufferInformation::addBuffer<int32_t>)
+        .def("add_buffer_bool", &NeuralNetworkBufferInformation::addBuffer<uint8_t>)
+        .def("get_buffer_float", &NeuralNetworkBufferInformation::getBuffer<float>)
+        .def("get_buffer_int", &NeuralNetworkBufferInformation::getBuffer<int32_t>)
+        .def("get_buffer_bool", &NeuralNetworkBufferInformation::getBuffer<uint8_t>);
+    
+    py::enum_<NNBuffer::BufferMode>(netBuffer, "mode")
+        .value("write", NNBuffer::BufferMode::Write)
+        .value("append", NNBuffer::BufferMode::Append)
+        .value("read", NNBuffer::BufferMode::Read)
         .export_values();
 
     return m.ptr();

coremltools/_deps/__init__.py

@@ -86,10 +86,10 @@ def __get_sklearn_version(version):
 _HAS_TF = True
 _HAS_TF_1 = False
 _HAS_TF_2 = False
-_TF_1_MIN_VERSION = "1.0.0"
+_TF_1_MIN_VERSION = "1.12.0"
 _TF_1_MAX_VERSION = "1.15.0"
 _TF_2_MIN_VERSION = "2.1.0"
-_TF_2_MAX_VERSION = "2.2.0"
+_TF_2_MAX_VERSION = "2.3.0"
 
 try:
     import tensorflow

coremltools/converters/_converters_entry.py

@@ -327,7 +327,8 @@ def _flatten_list(_inputs):
     if convert_to == 'mil':
         return proto_spec # Returns the MIL program
 
-    model = coremltools.models.MLModel(proto_spec, useCPUOnly=True)
+    useCPUOnly = kwargs.get("useCPUOnly", True)
+    model = coremltools.models.MLModel(proto_spec, useCPUOnly=useCPUOnly)
 
     if minimum_deployment_target is not None:
         check_deployment_compatibility(