Build TF ops in cxx11_abi packages

Update node.js install method
isl-org · Jan 2, 2024 · ef87c3d · ef87c3d
1 parent c6496f6
commit ef87c3d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci
@@ -158,7 +158,11 @@ RUN source util/ci_utils.sh \
  && pip install -r python/requirements_test.txt
 
 # Open3D Jupyter dependencies
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
+ | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" \
+ | tee /etc/apt/sources.list.d/nodesource.list \
+ && apt-get update \
  && apt-get install -y nodejs \
  && rm -rf /var/lib/apt/lists/* \
  && node --version \
@@ -175,7 +179,11 @@ RUN \
         export CMAKE_CXX_COMPILER=g++; \
         export CMAKE_C_COMPILER=gcc; \
         # TODO: PyTorch still use old CXX ABI, remove this line when PyTorch is updated
-        export GLIBCXX_USE_CXX11_ABI=OFF; \
+        if [ "$BUILD_PYTORCH_OPS" = "ON" ]; then \
+            export GLIBCXX_USE_CXX11_ABI=OFF; \
+        else \
+            export GLIBCXX_USE_CXX11_ABI=ON; \
+        fi \
     fi \
  && mkdir build \
  && cd build \

diff --git a/docker/docker_build.sh b/docker/docker_build.sh
@@ -44,21 +44,21 @@ OPTION:
 
     # Ubuntu CPU CI (Dockerfile.ci)
     cpu-static                  : Ubuntu CPU static
-    cpu-shared                  : Ubuntu CPU shared
-    cpu-shared-release          : Ubuntu CPU shared, release mode
-    cpu-shared-ml               : Ubuntu CPU shared with ML
-    cpu-shared-ml-release       : Ubuntu CPU shared with ML, release mode
+    cpu-shared                  : Ubuntu CPU shared (cxx11_abi)
+    cpu-shared-release          : Ubuntu CPU shared (cxx11_abi), release mode
+    cpu-shared-ml               : Ubuntu CPU shared with ML (pre_cxx11_abi)
+    cpu-shared-ml-release       : Ubuntu CPU shared with ML (pre_cxx11_abi), release mode
 
     # Sycl CPU CI (Dockerfile.ci)
     sycl-shared                : SYCL (oneAPI) with shared lib
     sycl-static                : SYCL (oneAPI) with static lib
 
     # ML CIs (Dockerfile.ci)
     2-bionic                   : CUDA CI, 2-bionic, developer mode
-    3-ml-shared-bionic-release : CUDA CI, 3-ml-shared-bionic, release mode
-    3-ml-shared-bionic         : CUDA CI, 3-ml-shared-bionic, developer mode
-    4-shared-bionic            : CUDA CI, 4-shared-bionic, developer mode
-    4-shared-bionic-release    : CUDA CI, 4-shared-bionic, release mode
+    3-ml-shared-bionic-release : CUDA CI, 3-ml-shared-bionic (pre_cxx11_abi), release mode
+    3-ml-shared-bionic         : CUDA CI, 3-ml-shared-bionic (pre_cxx11_abi), developer mode
+    4-shared-bionic            : CUDA CI, 4-shared-bionic (cxx11_abi), developer mode
+    4-shared-bionic-release    : CUDA CI, 4-shared-bionic (cxx11_abi), release mode
     5-ml-focal                 : CUDA CI, 5-ml-focal, developer mode
 
     # CUDA wheels (Dockerfile.wheel)
@@ -314,7 +314,8 @@ ci_build() {
     export PYTHON_VERSION=3.8
     export BUILD_SHARED_LIBS=ON
     export BUILD_CUDA_MODULE=ON
-    export BUILD_TENSORFLOW_OPS=OFF
+     # TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
+    export BUILD_TENSORFLOW_OPS=ON
     export BUILD_PYTORCH_OPS=OFF
     export PACKAGE=ON
     export BUILD_SYCL_MODULE=OFF
@@ -329,7 +330,8 @@ ci_build() {
     export PYTHON_VERSION=3.8
     export BUILD_SHARED_LIBS=ON
     export BUILD_CUDA_MODULE=ON
-    export BUILD_TENSORFLOW_OPS=OFF
+     # TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
+    export BUILD_TENSORFLOW_OPS=ON
     export BUILD_PYTORCH_OPS=OFF
     export PACKAGE=ON
     export BUILD_SYCL_MODULE=OFF
@@ -375,7 +377,8 @@ cpu-shared_export_env() {
     export PYTHON_VERSION=3.8
     export BUILD_SHARED_LIBS=ON
     export BUILD_CUDA_MODULE=OFF
-    export BUILD_TENSORFLOW_OPS=OFF
+     # TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
+    export BUILD_TENSORFLOW_OPS=ON
     export BUILD_PYTORCH_OPS=OFF
     export PACKAGE=ON
     export BUILD_SYCL_MODULE=OFF
@@ -406,7 +409,8 @@ cpu-shared-release_export_env() {
     export PYTHON_VERSION=3.8
     export BUILD_SHARED_LIBS=ON
     export BUILD_CUDA_MODULE=OFF
-    export BUILD_TENSORFLOW_OPS=OFF
+     # TODO: tensorflow tests moved here till PyTorch supports cxx11_abi
+    export BUILD_TENSORFLOW_OPS=ON
     export BUILD_PYTORCH_OPS=OFF
     export PACKAGE=ON
     export BUILD_SYCL_MODULE=OFF