scikit-hep · jpivarski · Aug 1, 2024 · Aug 1, 2024 · Aug 6, 2024
diff --git a/awkward-cpp/CMakeLists.txt b/awkward-cpp/CMakeLists.txt
@@ -11,14 +11,6 @@ project(
 message(STATUS "CMake version ${CMAKE_VERSION}")
 message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
 
-if(CMAKE_CXX_COMPILER_ID MATCHES AppleClang AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL
-                                                15)
-  if(CMAKE_VERSION VERSION_LESS 3.29)
-    message(WARNING "CMake should be 3.29+ to support AppleClang 15+. Trying anyway.")
-  endif()
-  set(CMAKE_LINKER_TYPE APPLE_CLASSIC)
-endif()
-
 # Check for header-only libraries
 if(NOT (EXISTS "header-only" AND EXISTS "include/awkward/kernels.h"))
   message(
@@ -42,7 +34,6 @@ endif()
 
 # Three tiers: [cpu-kernels (extern "C" interface), cuda-kernels (extern "C" interface)],
 # libawkward (C++), and Python modules.
-file(GLOB CPU_KERNEL_SOURCES CONFIGURE_DEPENDS "src/cpu-kernels/*.cpp")
 file(GLOB_RECURSE LIBAWKWARD_SOURCES CONFIGURE_DEPENDS "src/libawkward/*.cpp")
 
 # Shared properties
@@ -58,15 +49,6 @@ target_include_directories(awkward-parent INTERFACE rapidjson/include)
 add_subdirectory(header-only EXCLUDE_FROM_ALL)
 target_link_libraries(awkward-parent INTERFACE awkward::growable-buffer)
 
-# First tier: cpu-kernels
-add_library(awkward-cpu-kernels SHARED ${CPU_KERNEL_SOURCES})
-target_link_libraries(awkward-cpu-kernels PUBLIC awkward-parent)
-set_target_properties(
-  awkward-cpu-kernels
-  PROPERTIES CXX_VISIBILITY_PRESET hidden
-             VISIBILITY_INLINES_HIDDEN ON
-             CXX_EXTENSIONS NO)
-
 # Second tier: libawkward
 add_library(awkward SHARED ${LIBAWKWARD_SOURCES})
 if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
@@ -109,7 +91,7 @@ set_target_properties(
 file(GLOB_RECURSE PYTHON_SOURCES "src/${SKBUILD_PROJECT_NAME}/*.py")
 
 install(
-  TARGETS awkward awkward-parent awkward-cpu-kernels _ext
+  TARGETS awkward awkward-parent _ext
   LIBRARY DESTINATION "${SKBUILD_PROJECT_NAME}/lib"
   RUNTIME DESTINATION "${SKBUILD_PROJECT_NAME}/lib"
   ARCHIVE DESTINATION "${SKBUILD_PROJECT_NAME}/lib")

diff --git a/awkward-cpp/src/awkward_cpp/__init__.py b/awkward-cpp/src/awkward_cpp/__init__.py
@@ -1,6 +1,3 @@
 # BSD 3-Clause License; see https://github.com/scikit-hep/awkward/blob/main/LICENSE
 
 from __future__ import annotations
-
-import awkward_cpp.cpu_kernels
-import awkward_cpp.libawkward  # noqa: F401
diff --git a/awkward-cpp/src/cpu-kernels/awkward_BitMaskedArray_to_ByteMaskedArray.cpp b/awkward-cpp/src/cpu-kernels/awkward_BitMaskedArray_to_ByteMaskedArray.cpp
diff --git a/awkward-cpp/src/cpu-kernels/awkward_BitMaskedArray_to_IndexedOptionArray.cpp b/awkward-cpp/src/cpu-kernels/awkward_BitMaskedArray_to_IndexedOptionArray.cpp
diff --git a/awkward-cpp/src/cpu-kernels/awkward_ByteMaskedArray_getitem_nextcarry.cpp b/awkward-cpp/src/cpu-kernels/awkward_ByteMaskedArray_getitem_nextcarry.cpp
diff --git a/awkward-cpp/src/cpu-kernels/awkward_ByteMaskedArray_getitem_nextcarry_outindex.cpp b/awkward-cpp/src/cpu-kernels/awkward_ByteMaskedArray_getitem_nextcarry_outindex.cpp
diff --git a/awkward-cpp/src/cpu-kernels/awkward_ByteMaskedArray_numnull.cpp b/awkward-cpp/src/cpu-kernels/awkward_ByteMaskedArray_numnull.cpp
diff --git a/awkward-cpp/src/cpu-kernels/awkward_ByteMaskedArray_overlay_mask.cpp b/awkward-cpp/src/cpu-kernels/awkward_ByteMaskedArray_overlay_mask.cpp