Fix support for Ninja and add Ninja build in Simple CI

.github/workflows/simple.yml

@@ -21,27 +21,20 @@ jobs:
   hosted:
     name: CPU-only
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.allow_fail }}
     needs: [cancel_previous]
     strategy:
-      max-parallel: 5
+      fail-fast: false
       matrix:
         test_suite: ["mac", "ubuntu"]
-        cmake_build_type:
-          [
-            "CMAKE_BUILD_TYPE=Debug",
-            "CMAKE_BUILD_TYPE=Release",
-            "CMAKE_BUILD_TYPE=RelWithDebInfo",
-          ]
+        cmake_generator: ["Ninja", "Unix Makefiles"]
+        cmake_build_type: ["CMAKE_BUILD_TYPE=Debug", "CMAKE_BUILD_TYPE=Release"]
         build_shared_libs: ["BUILD_SHARED_LIBS=ON", "BUILD_SHARED_LIBS=OFF"]
         include:
           - test_suite: mac
             os: "macos-10.15"
-            allow_fail: false
             make_concurrency: 2
           - test_suite: ubuntu
             os: "ubuntu-20.04"
-            allow_fail: false
             make_concurrency: 2
     steps:
       - uses: actions/checkout@v2
@@ -50,12 +43,12 @@ jobs:
       - name: Install dependencies (homebrew)
         if: matrix.test_suite == 'mac'
         run: |
-          brew install nasm
+          brew install nasm ninja
         shell: bash
       - name: Install dependencies (apt)
         if: matrix.test_suite == 'ubuntu'
         run: |
-          sudo apt install -y libopenblas-dev nasm g++ gcc python3-pip
+          sudo apt install -y libopenblas-dev nasm g++ gcc python3-pip ninja-build
         shell: bash
       - name: Cache pip (Linux)
         if: startsWith(runner.os, 'Linux')
@@ -80,6 +73,7 @@ jobs:
           cmake_flags=""
           cmake_flags+=" -DRPC_BACKEND=LOCAL"
           cmake_flags+=" -DBUILD_CUDA=OFF"
+          cmake_flags+=" -G '${{ matrix.cmake_generator }}'"
           cmake_flags+=" -D${{ matrix.cmake_build_type }}"
           cmake_flags+=" -D${{ matrix.build_shared_libs }}"
           echo "cmake_flags=${cmake_flags}" >> $GITHUB_ENV
@@ -91,40 +85,40 @@ jobs:
           mkdir -p build-third_party
           mkdir -p third_party_install
           cd build-third_party
-          cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=ON -DONEFLOW=OFF -DTHIRD_PARTY_DIR=$(realpath ../third_party_install)
-          make -j $(nproc)
+          cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=ON -DONEFLOW=OFF -DTHIRD_PARTY_DIR=$PWD/../third_party_install
+          cmake --build . -j $(nproc)
         shell: bash
       - name: Build (of_ccobj)
         if: startsWith(runner.os, 'Linux')
         run: |
           mkdir -p build
           cd build
-          cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=OFF -DONEFLOW=ON -DTHIRD_PARTY_DIR=$(realpath ../third_party_install)
-          make -j ${{ matrix.make_concurrency }} of_ccobj
+          cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=OFF -DONEFLOW=ON -DTHIRD_PARTY_DIR=$PWD/../third_party_install
+          cmake --build . -j ${{ matrix.make_concurrency }} --target of_ccobj
         shell: bash
       - name: Build (oneflow_internal)
         if: startsWith(runner.os, 'Linux')
         run: |
           mkdir -p build
           cd build
           cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=OFF -DONEFLOW=ON
-          make -j ${{ matrix.make_concurrency }} oneflow_internal
+          cmake --build . -j ${{ matrix.make_concurrency }} --target oneflow_internal
         shell: bash
       - name: Build (generate_api)
         if: startsWith(runner.os, 'Linux')
         run: |
           mkdir -p build
           cd build
           cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=OFF -DONEFLOW=ON
-          make -j ${{ matrix.make_concurrency }} generate_api
+          cmake --build . -j ${{ matrix.make_concurrency }} --target generate_api
         shell: bash
       - name: Build (ALL)
         if: startsWith(runner.os, 'Linux')
         run: |
           mkdir -p build
           cd build
           cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=OFF -DONEFLOW=ON
-          make -j ${{ matrix.make_concurrency }}
+          cmake --build . -j ${{ matrix.make_concurrency }}
         shell: bash
       - name: Exe test
         if: startsWith(runner.os, 'Linux')

README.md

@@ -1,5 +1,9 @@
+# OneFlow
+
 **OneFlow is a performance-centered and open-source deep learning framework.**
 
+[![Simple CI](https://github.com/Oneflow-Inc/oneflow/actions/workflows/simple.yml/badge.svg)](https://github.com/Oneflow-Inc/oneflow/actions/workflows/simple.yml)
+
 ## Install OneFlow
 
   ### System Requirements

cmake/third_party/grpc.cmake

@@ -44,7 +44,7 @@ ExternalProject_Add(grpc
     URL_HASH MD5=${GRPC_URL_HASH}
     UPDATE_COMMAND ""
     BUILD_IN_SOURCE 1
-    BUILD_COMMAND make -j${PROC_NUM} grpc grpc_unsecure grpc++_unsecure
+    BUILD_COMMAND ${CMAKE_COMMAND} --build . -j ${PROC_NUM} -t grpc grpc_unsecure grpc++_unsecure
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
         -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}

cmake/third_party/lz4.cmake

@@ -28,14 +28,16 @@ set(LZ4_CFLAGS "-O3 -fPIC")
 
 if(THIRD_PARTY)
 
+include(ProcessorCount)
+ProcessorCount(PROC_NUM)
 ExternalProject_Add(lz4
     PREFIX lz4
     URL ${LZ4_URL}
     URL_MD5 3898c56c82fb3d9455aefd48db48eaad
     UPDATE_COMMAND ""
     CONFIGURE_COMMAND ""
     BUILD_IN_SOURCE 1
-    BUILD_COMMAND make -j lib CFLAGS=${LZ4_CFLAGS}
+    BUILD_COMMAND make -j ${PROC_NUM} lib CFLAGS=${LZ4_CFLAGS}
     INSTALL_COMMAND ""
 )