Skip to content

Commit 3371c14

Browse files
authored
fix: export operator call instantiations (#623)
* revert: remove public functional operator API * fix: export operator call instantiations
1 parent 4273849 commit 3371c14

8 files changed

Lines changed: 195 additions & 379 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.18)
2-
project(InfiniOps VERSION 0.1.0 LANGUAGES CXX)
3-
4-
include(GNUInstallDirs)
2+
project(InfiniOps LANGUAGES CXX)
53

64
if(POLICY CMP0116)
75
cmake_policy(SET CMP0116 NEW)
@@ -36,7 +34,8 @@ option(BUILD_CUSTOM_KERNEL "Build custom AscendC kernel PyTorch extension (requi
3634

3735
option(AUTO_DETECT_DEVICES "Automatically detect available devices" OFF)
3836
option(AUTO_DETECT_BACKENDS "Automatically detect available backends" OFF)
39-
option(GENERATE_CPP_OPERATOR_API "Generate public C++ operator API" ON)
37+
option(GENERATE_OPERATOR_CALL_INSTANTIATIONS
38+
"Generate explicit operator call instantiations" ON)
4039
option(GENERATE_PYTHON_BINDINGS "Generate Python bindings" OFF)
4140

4241
set(_DEFAULT_HYGON_DTK_ROOT "/opt/dtk")
@@ -322,13 +321,10 @@ if(WITH_ILUVATAR)
322321
if(NOT ILUVATAR_CUDA_COMPILER)
323322
message(FATAL_ERROR "`WITH_ILUVATAR` is `ON` but CoreX `clang++` was not found.")
324323
endif()
325-
get_filename_component(ILUVATAR_CUDA_BIN_DIR "${ILUVATAR_CUDA_COMPILER}" DIRECTORY)
326-
get_filename_component(ILUVATAR_CUDA_ROOT "${ILUVATAR_CUDA_BIN_DIR}/.." ABSOLUTE)
327-
set(CUDAToolkit_ROOT "${ILUVATAR_CUDA_ROOT}" CACHE PATH "Iluvatar CoreX toolkit root")
328324
set(ILUVATAR_CUDA_FLAGS
329-
"--cuda-gpu-arch=${ILUVATAR_ARCH};-fPIC;-Wno-error=unused-variable;-Wno-error=unused-private-field;-Wno-unused-variable;-std=c++17;--cuda-path=${ILUVATAR_CUDA_ROOT};-x;ivcore"
325+
"--cuda-gpu-arch=${ILUVATAR_ARCH};-fPIC;-Wno-error=unused-variable;-Wno-error=unused-private-field;-Wno-unused-variable;-std=c++17;--cuda-path=/usr/local/corex;-x;ivcore"
330326
CACHE STRING "Iluvatar CUDA compiler flags")
331-
message(STATUS "Iluvatar: CUDA compiler ${ILUVATAR_CUDA_COMPILER}, arch ${ILUVATAR_ARCH}, toolkit ${ILUVATAR_CUDA_ROOT}")
327+
message(STATUS "Iluvatar: CUDA compiler ${ILUVATAR_CUDA_COMPILER}, arch ${ILUVATAR_ARCH}")
332328
find_package(CUDAToolkit REQUIRED)
333329
endif()
334330

@@ -446,7 +442,6 @@ if(WITH_MOORE)
446442
find_library(MUSA_LIB NAMES musa HINTS "${MUSA_ROOT}/lib" REQUIRED)
447443
find_library(MUSART_LIB NAMES musart HINTS "${MUSA_ROOT}/lib" REQUIRED)
448444
find_library(MUBLAS_LIB NAMES mublas HINTS "${MUSA_ROOT}/lib" REQUIRED)
449-
find_library(MUSA_OPENMP_LIB NAMES omp iomp5 HINTS "${MUSA_ROOT}/lib" REQUIRED)
450445
endif()
451446

452447
if(WITH_CAMBRICON)
@@ -481,7 +476,6 @@ endif()
481476

482477
# If all other platforms are not enabled, CPU is enabled by default.
483478
if(NOT WITH_NVIDIA AND NOT WITH_ILUVATAR AND NOT WITH_HYGON AND NOT WITH_METAX AND NOT WITH_MOORE AND NOT WITH_CAMBRICON AND NOT WITH_ASCEND)
484-
set(WITH_CPU ON CACHE BOOL "Enable CPU backend" FORCE)
485479
add_compile_definitions(WITH_CPU=1)
486480
endif()
487481

cmake/InfiniOpsConfig.cmake.in

Lines changed: 0 additions & 3 deletions
This file was deleted.

cmake/infiniops.pc.in

Lines changed: 0 additions & 10 deletions
This file was deleted.

include/infini/ops.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define INFINI_OPS_H_
33

44
#ifdef __cplusplus
5-
#include <infini/functional_ops.h>
5+
#include <infini/operator_call_instantiations.h>
66
#endif
77

88
#endif // INFINI_OPS_H_

0 commit comments

Comments
 (0)