Fixes for tflite

cm-mlops/script/app-mlperf-inference/_cm.yaml

@@ -343,7 +343,7 @@ deps:
 
 # Variations to customize dependencies
 variations:
-  # Implementation (CPP or Python)
+  # Implementation (cpp, python, nvidia, tflite-cpp)
   cpp:
     add_deps_recursive:
       imagenet-accuracy-script:
@@ -356,6 +356,19 @@ variations:
          - cpp-mlperf-inference
         tags: app,mlperf,cpp,inference
 
+  tflite-cpp:
+    add_deps_recursive:
+      imagenet-accuracy-script:
+        tags: _int64
+    env:
+      CM_MLPERF_TFLITE_CPP: 'yes'
+      CM_MLPERF_CPP: 'yes'
+      CM_MLPERF_IMPLEMENTATION: tflite-cpp
+    posthook_deps:
+      - names:
+         - tflite-cpp-mlperf-inference
+        tags: app,mlperf,tflite-cpp,inference
+
   python:
     add_deps_recursive:
       imagenet-accuracy-script:

cm-mlops/script/get-bazel/_cm.json

@@ -6,7 +6,8 @@
   "category": "Detection or installation of tools and artifacts",
   "clean_files": [],
   "new_env_keys": [
-    "CM_BAZEL_*"
+    "CM_BAZEL_*",
+    "+PATH"
   ],
   "prehook_deps": [
     {

cm-mlops/script/get-bazel/customize.py

@@ -53,6 +53,7 @@ def postprocess(i):
 
     found_path = os.path.dirname(found_file_path)
     env['CM_BAZEL_INSTALLED_PATH'] = found_path
+    env['+PATH'] = [ found_path ]
 
     env['CM_BAZEL_CACHE_TAGS'] = 'version-'+version
 

cm-mlops/script/get-cmake/_cm.json

@@ -14,6 +14,7 @@
   ],
   "new_env_keys": [
     "CM_CMAKE_*",
+    "CM_MAKE_CORES",
     "+PATH"
   ],
   "prehook_deps": [

cm-mlops/script/get-preprocessed-dataset-imagenet/preprocess.py

@@ -18,7 +18,7 @@
     count = int(os.environ.get('CM_DATASET_SIZE', 1))
     preprocessed_base_dir = os.environ.get('CM_DATASET_PREPROCESSED_PATH', os.getcwd())
     threads = os.environ.get('CM_NUM_THREADS', os.cpu_count())
-    threads = os.environ.get('CM_NUM_PREPROCESS_THREADS', threads)
+    threads = int(os.environ.get('CM_NUM_PREPROCESS_THREADS', threads))
 
     if os.environ.get('CM_MODEL', 'resnet50') == 'resnet50':
         pre_process = dataset.pre_process_vgg

cm-mlops/script/install-bazel/_cm.json

@@ -10,6 +10,9 @@
       "tags": "detect,os"
     }
   ],
+  "new_env_keys": [
+    "CM_BAZEL_*"
+  ],
   "env": {
     "CM_WGET_URL": "https://github.com/bazelbuild/bazel/releases/download/[VERSION]/bazel-[VERSION]-installer-[OS]-[PLATFORM].sh"
   },

cm-mlops/script/install-tensorflow-from-src/_cm.json

@@ -11,8 +11,10 @@
       "tags": "detect,cpu"
     }
   ],
-  "env": {
-    "CM_GIT_URL": "https://github.com/tensorflow/tensorflow"
+  "default_env": {
+    "CM_GIT_URL": "https://github.com/tensorflow/tensorflow",
+    "CM_GIT_DEPTH": "1",
+    "CM_TFLITE": "off"
   },
   "extra_cache_tags_from_env": [
     {
@@ -21,12 +23,28 @@
     }
   ],
   "tags": [
+    "get",
     "install",
     "tensorflow",
     "lib",
+    "source",
+    "from-source",
     "from-src"
   ],
+  "new_env_keys": [
+    "+C_INCLUDE_PATH",
+    "+CPLUS_INCLUDE_PATH",
+    "+LD_LIBRARY_PATH",
+    "+DYLD_FALLBACK_LIBRARY_PATH"
+  ],
   "uid": "a974533c4c854597",
+  "variations": {
+    "tflite": {
+      "env": {
+        "CM_TFLITE": "on"
+      }
+    }
+  },
   "versions": {
     "master": {
       "deps": [
@@ -37,11 +55,11 @@
         },
         {
           "tags": "gcc,get",
-          "version": "9.3"
+          "version_min": "9.3"
         },
         {
-          "tags": "gcc,bazel",
-          "version": "5.0.0"
+          "tags": "get,bazel",
+          "version": "5.3.0"
         }
       ],
       "env": {

cm-mlops/script/install-tensorflow-from-src/run.sh

@@ -2,8 +2,8 @@
 
 CUR_DIR=${PWD:-tmp}
 if [ ! -d "src" ]; then
-  echo "Cloning Tensorflow from ${CM_GIT_URL} with branch ${CM_GIT_CHECKOUT}..."
-  git clone --recursive -b "${CM_GIT_CHECKOUT}" ${CM_GIT_URL} src
+  echo "Cloning Tensorflow from ${CM_GIT_URL} with branch ${CM_GIT_CHECKOUT} --depth ${CM_GIT_DEPTH}..."
+  git clone --recursive -b "${CM_GIT_CHECKOUT}" ${CM_GIT_URL} --depth ${CM_GIT_DEPTH} src
 fi
 CM_PYTHON_BIN=${CM_PYTHON_BIN:-python3}
 ${CM_PYTHON_BIN} -m pip install numpy
@@ -21,6 +21,11 @@ cd src
 ./configure
 if [ "${?}" != "0" ]; then exit 1; fi
 
+if [ "${CM_TFLITE}" == "on" ]; then
+    bazel build -c opt --define tflite_with_xnnpack=true //tensorflow/lite:libtensorflowlite.so
+    if [ "${?}" != "0" ]; then exit 1; fi
+    exit 0
+fi
 echo "******************************************************"
 bazel build //tensorflow/tools/pip_package:build_pip_package
 if [ "${?}" != "0" ]; then exit 1; fi

cm-mlops/script/install-tflite-from-src/_cm.json

@@ -17,6 +17,9 @@
       "tags": "get,cmake"
     }
   ],
+  "default_env": {
+    "CM_GIT_DEPTH": "1"
+  },
   "env": {
     "CM_GIT_URL": "https://github.com/tensorflow/tensorflow"
   },
@@ -26,11 +29,17 @@
       "prefix": "python-"
     }
   ],
+  "new_env_keys": [
+    "+C_INCLUDE_PATH",
+    "+CPLUS_INCLUDE_PATH",
+    "+LD_LIBRARY_PATH",
+    "+DYLD_FALLBACK_LIBRARY_PATH"
+  ],
   "tags": [
+    "get",
     "install",
-    "tflite",
-    "tensorflow-lite",
-    "lib",
+    "tflite-cmake",
+    "tensorflow-lite-cmake",
     "from-src"
   ],
   "uid": "5c72dab5eb88407c",

cm-mlops/script/install-tflite-from-src/customize.py

@@ -17,10 +17,10 @@ def postprocess(i):
 #        if key not in env:
         env[key] = []
 
-    env['+C_INCLUDE_PATH'].append(os.path.join(os.getcwd(), 'install', 'include'))
-    env['+CPLUS_INCLUDE_PATH'].append(os.path.join(os.getcwd(), 'install', 'include'))
+    env['+C_INCLUDE_PATH'].append(os.path.join(os.getcwd(), 'src'))
+    env['+CPLUS_INCLUDE_PATH'].append(os.path.join(os.getcwd(), 'src'))
 
-    lib_path = os.path.join(os.getcwd(), 'install', 'lib')
+    lib_path = os.path.join(os.getcwd(), 'build')
     env['+LD_LIBRARY_PATH'].append(lib_path)
     env['+DYLD_FALLBACK_LIBRARY_PATH'].append(lib_path)
 

cm-mlops/script/install-tflite-from-src/run.sh

@@ -2,12 +2,11 @@
 
 CUR_DIR=${PWD:-tmp}
 if [ ! -d "src" ]; then
-  echo "Cloning Tensorflow from ${CM_GIT_URL} with branch ${CM_GIT_CHECKOUT}..."
-  git clone --recursive -b "${CM_GIT_CHECKOUT}" ${CM_GIT_URL} src
+  echo "Cloning Tensorflow from ${CM_GIT_URL} with branch ${CM_GIT_CHECKOUT} --depth ${CM_GIT_DEPTH}..."
+  git clone --recursive -b "${CM_GIT_CHECKOUT}" ${CM_GIT_URL} --depth ${CM_GIT_DEPTH} src
 fi
 
 INSTALL_DIR="${CUR_DIR}"
-rm -rf ${INSTALL_DIR}/install
 rm -rf ${INSTALL_DIR}/build
 
 cd ${INSTALL_DIR}
@@ -16,18 +15,13 @@ mkdir -p install
 
 echo "******************************************************"
 cd build
-cmake ../src/tensorflow/lite
+cmake ../src/tensorflow/lite/c
 if [ "${?}" != "0" ]; then exit 1; fi
 
 echo "******************************************************"
-cmake --build . -j
+cmake --build . -j${CM_MAKE_CORES}
 if [ "${?}" != "0" ]; then exit 1; fi
 
-# Clean build directory
-cd ${INSTALL_DIR}
-if [ "${CM_TFLITE_CLEAN_BUILD}" != "no" ]; then
-    rm -rf build
-fi
 
 echo "******************************************************"
-echo "Tflite is built and installed to ${INSTALL_DIR}/install ..."
+echo "Tflite is built to ${INSTALL_DIR}/build ..."