Skip to content

Commit

Permalink
[Build] Deprecate export_core (#7028)
Browse files Browse the repository at this point in the history
Issue: #

### Brief Summary
  • Loading branch information
jim19930609 authored Jan 4, 2023
1 parent ec79dc1 commit 481ded6
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 120 deletions.
1 change: 0 additions & 1 deletion .github/workflows/scripts/android-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ python -m pip install -r requirements_dev.txt
python setup.py clean
python setup.py build_ext
cd build
aarch64-linux-android-strip libtaichi_export_core.so
aarch64-linux-android-strip libtaichi_c_api.so

chmod -R 777 "$SCCACHE_DIR"
10 changes: 0 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,16 +196,6 @@ endif()
configure_file(taichi/common/version.h.in ${CMAKE_SOURCE_DIR}/taichi/common/version.h)
configure_file(taichi/common/commit_hash.h.in ${CMAKE_SOURCE_DIR}/taichi/common/commit_hash.h)

option(TI_EXPORT_CORE "export taichi core" OFF)

if(ANDROID)
set(TI_EXPORT_CORE ON)
endif()

if (TI_EXPORT_CORE)
include(cmake/TaichiExportCore.cmake)
endif()

option(TI_WITH_C_API "build taichi runtime c-api library" OFF)

if (TI_WITH_C_API)
Expand Down
3 changes: 0 additions & 3 deletions cmake/TaichiCore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ set(INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/python/taichi/_lib)

if(ANDROID)
set(TI_WITH_VULKAN ON)
set(TI_EXPORT_CORE ON)
set(TI_WITH_LLVM OFF)
set(TI_WITH_METAL OFF)
set(TI_WITH_CUDA OFF)
Expand Down Expand Up @@ -435,8 +434,6 @@ target_link_libraries(taichi_ui PUBLIC ${CORE_LIBRARY_NAME})
if(TI_WITH_PYTHON)
message("PYTHON_LIBRARIES: " ${PYTHON_LIBRARIES})
set(CORE_WITH_PYBIND_LIBRARY_NAME taichi_python)
# Cannot compile Python source code with Android, but TI_EXPORT_CORE should be set and
# Android should only use the isolated library ignoring those source code.
if (NOT ANDROID)
# NO_EXTRAS is required here to avoid llvm symbol error during build
file(GLOB TAICHI_PYBIND_SOURCE
Expand Down
101 changes: 0 additions & 101 deletions cmake/TaichiExportCore.cmake

This file was deleted.

5 changes: 0 additions & 5 deletions cmake/taichi_export_coreConfig.cmake.in

This file was deleted.

0 comments on commit 481ded6

Please sign in to comment.