Enable ONNX_ML by default (onnx#1810)

* Enable ONNX_ML by default

Apparently, official wheel packages enable it. However, if a
user builds ONNX by herself/himself, ONNX_ML will be disabled
by default. For example, as of writing, ONNX does not have a
wheel package for Python 3.7 and users need to build ONNX.

* Disable ONNX_ML for PyTorch

* Honor ONNX_ML in an environment variable

* Fix the condition for ONNX_ML in gen_doc.py

* Revert a permission change

Author: shinh

.circleci/build.sh

@@ -31,6 +31,7 @@ pip install -U pip setuptools
 # setup onnx as the submodule of pytorch
 PYTORCH_DIR=/tmp/pytorch
 ONNX_DIR="$PYTORCH_DIR/third_party/onnx"
+export ONNX_ML=0
 git clone --recursive --quiet https://github.com/pytorch/pytorch.git "$PYTORCH_DIR"
 rm -rf "$ONNX_DIR"
 cp -r "$PWD" "$ONNX_DIR"

.travis.yml

@@ -4,44 +4,44 @@ matrix:
   include:
     - os: linux
       sudo: required
-      env: PYTHON_VERSION=python2
+      env: PYTHON_VERSION=python2 ONNX_ML=0
       language: python
       python: "2.7"
     - os: linux
       sudo: required
-      env: PYTHON_VERSION=python3
+      env: PYTHON_VERSION=python3 ONNX_ML=0
       language: python
       python: "3.6"
     - os: osx
       osx_image: xcode9.3
-      env: PYTHON_VERSION=python2
+      env: PYTHON_VERSION=python2 ONNX_ML=0
     - os: osx
       osx_image: xcode9.3
-      env: PYTHON_VERSION=python3
+      env: PYTHON_VERSION=python3 ONNX_ML=0
     - os: linux
       sudo: required
-      env: PYTHON_VERSION=python2 ONNX_ML=1
+      env: PYTHON_VERSION=python2
       language: python
       python: "2.7"
     - os: linux
       sudo: required
-      env: PYTHON_VERSION=python3 ONNX_ML=1
+      env: PYTHON_VERSION=python3
       language: python
       python: "3.6"
     - os: osx
       osx_image: xcode9.3
-      env: PYTHON_VERSION=python2 ONNX_ML=1
+      env: PYTHON_VERSION=python2
     - os: osx
       osx_image: xcode9.3
-      env: PYTHON_VERSION=python3 ONNX_ML=1
+      env: PYTHON_VERSION=python3
     - os: linux
       sudo: required
-      env: PYTHON_VERSION=python2 ONNX_ML=1 LITE=1
+      env: PYTHON_VERSION=python2 LITE=1
       language: python
       python: "2.7"
     - os: osx
       osx_image: xcode9.3
-      env: PYTHON_VERSION=python2 ONNX_ML=1 LITE=1
+      env: PYTHON_VERSION=python2 LITE=1
 
 env:
   global:

CMakeLists.txt

@@ -23,6 +23,12 @@ option(ONNX_WERROR "Build with Werror" OFF)
 option(ONNX_COVERAGE "Build with coverage instrumentation" OFF)
 option(ONNX_BUILD_TESTS "Build ONNX C++ APIs Tests" OFF)
 option(ONNX_USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
+if(DEFINED ENV{ONNX_ML})
+  set(DEFAULT_ONNX_ML $ENV{ONNX_ML})
+else()
+  set(DEFAULT_ONNX_ML ON)
+endif()
+option(ONNX_ML "Enable traditional ML API." ${DEFAULT_ONNX_ML})
 option(ONNXIFI_DUMMY_BACKEND "Use dummy backend in onnxifi test driver." OFF)
 
 # Set C++11 as standard for the whole project

appveyor.yml

@@ -18,17 +18,13 @@ environment:
 
   matrix:
   # onnx-ml
-  - ONNX_ML: 1
-    CONDA_PREFIX: C:\Miniconda35-x64
+  - CONDA_PREFIX: C:\Miniconda35-x64
 
-  - ONNX_ML: 1
-    CONDA_PREFIX: C:\Miniconda36-x64
+  - CONDA_PREFIX: C:\Miniconda36-x64
 
-  - ONNX_ML: 1
-    CONDA_PREFIX: C:\Miniconda36
+  - CONDA_PREFIX: C:\Miniconda36
 
-  - ONNX_ML: 1
-    CONDA_PREFIX: C:\Miniconda35
+  - CONDA_PREFIX: C:\Miniconda35
 
 install:
 - cmd: git submodule update --init --recursive

docs/CONTRIBUTING.md

@@ -8,7 +8,7 @@ way to get these dependencies is via [Anaconda](https://www.anaconda.com/downloa
 conda install -c conda-forge protobuf numpy
 ```
 
-During development, it's convenient to install ONNX in development mode (for ONNX-ML, set environment variable `ONNX_ML=1`):
+During development, it's convenient to install ONNX in development mode (to disable ONNX-ML, set environment variable `ONNX_ML=0`):
 
 ```
 git clone --recursive https://github.com/onnx/onnx.git

onnx/defs/gen_doc.py

@@ -20,7 +20,7 @@
 
 SNIPPETS = collect_snippets()
 SAMPLE_IMPLEMENTATIONS = collect_sample_implementations()
-ONNX_ML = bool(os.getenv('ONNX_ML') == '1')
+ONNX_ML = not bool(os.getenv('ONNX_ML') == '0')
 
 
 if ONNX_ML:
@@ -307,7 +307,7 @@ def main(args):  # type: (Type[Args]) -> None
             "            [def files](/onnx/defs) via [this script](/onnx/defs/gen_doc.py).\n"
             "            Do not modify directly and instead edit function definitions.*\n")
 
-        if os.getenv('ONNX_ML'):
+        if ONNX_ML:
             all_functions = defs.get_functions(ONNX_ML_DOMAIN)
         else:
             all_functions = defs.get_functions('')
@@ -317,7 +317,7 @@ def main(args):  # type: (Type[Args]) -> None
             for func in functions:
                 changelog_versionmap[func.since_version].append(func)
 
-        if os.getenv('ONNX_ML'):
+        if ONNX_ML:
             s = '## {}\n'.format(ONNX_ML_DOMAIN)
             domain_display_name = ONNX_ML_DOMAIN
             domain_prefix = '{}.'.format(ONNX_ML_DOMAIN)
@@ -431,13 +431,13 @@ def main(args):  # type: (Type[Args]) -> None
             "            [def files](/onnx/defs) via [this script](/onnx/defs/gen_doc.py).\n"
             "            Do not modify directly and instead edit function definitions.*\n")
 
-        if os.getenv('ONNX_ML'):
+        if ONNX_ML:
             all_functions = defs.get_functions(ONNX_ML_DOMAIN)
         else:
             all_functions = defs.get_functions('')
 
         if all_functions:
-            if os.getenv('ONNX_ML'):
+            if ONNX_ML:
                 s = '## {}\n'.format(ONNX_ML_DOMAIN)
                 domain_prefix = '{}.'.format(ONNX_ML_DOMAIN)
             else:

setup.py

@@ -41,7 +41,7 @@
 # Global variables for controlling the build variant
 ################################################################################
 
-ONNX_ML = bool(os.getenv('ONNX_ML') == '1')
+ONNX_ML = not bool(os.getenv('ONNX_ML') == '0')
 ONNX_NAMESPACE = os.getenv('ONNX_NAMESPACE', 'onnx')
 ONNX_BUILD_TESTS = bool(os.getenv('ONNX_BUILD_TESTS') == '1')
 

tools/update_doc.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# export ONNX_ML=1, # if you need to use ONNX_ML
+# export ONNX_ML=0, # if you need to disable ONNX_ML
 
 python_exist=`command -v python`
 if [ -z $python_exist ]; then