tuplex · LeonhardFS · Oct 15, 2023 · Oct 15, 2023 · Oct 15, 2023 · Oct 15, 2023
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -4,37 +4,65 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build_wheels:
-    name: Build wheel on ${{ matrix.os }} - py ${{ matrix.python-version }}
+    name: Build wheel for ${{ matrix.cibw-build }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11 ]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        # os: [ ubuntu-20.04, macos-11 ]
+        os: ["macos-12"]
+        python-version: ["3.9"] #["3.8", "3.9", "3.10", "3.11"]
+        hw: ["arm64"] #["x86_64", "arm64"]
+        # exclude:
+        #   - os: ubuntu-20.04
+        #     hw: "arm64"
+        #   - os: macos-11
+        #     python-version: "3.8"
+        #     hw: "arm64"
         include:
-          - os: ubuntu-20.04
-            python-version: "3.8"
-            cibw-build: "cp38-manylinux_x86_64"
-          - os: ubuntu-20.04
+        #   - os: ubuntu-20.04
+        #     python-version: "3.8"
+        #     cibw-build: "cp38-manylinux_x86_64"
+        #     hw: "x86_64"
+        #   - os: ubuntu-20.04
+        #     python-version: "3.9"
+        #     cibw-build: "cp39-manylinux_x86_64"
+        #     hw: "x86_64"
+        #   - os: ubuntu-20.04
+        #     python-version: "3.10"
+        #     cibw-build: "cp310-manylinux_x86_64"
+        #     hw: "x86_64"
+        #   - os: ubuntu-20.04
+        #     python-version: "3.11"
+        #     cibw-build: "cp311-manylinux_x86_64"
+        #     hw: "x86_64"
+        #   - os: macos-11
+        #     python-version: "3.8"
+        #     cibw-build: "cp38-macosx_x86_64"
+        #     hw: "x86_64"
+        #   - os: macos-11
+        #     python-version: "3.9"
+        #     cibw-build: "cp39-macosx_x86_64"
+        #     hw: "x86_64"
+        #   - os: macos-11
+        #     python-version: "3.10"
+        #     cibw-build: "cp310-macosx_x86_64"
+        #     hw: "x86_64"
+        #   - os: macos-11
+        #     python-version: "3.11"
+        #     cibw-build: "cp311-macosx_x86_64"
+        #     hw: "x86_64"
+          - os: macos-12
             python-version: "3.9"
-            cibw-build: "cp39-manylinux_x86_64"
-          - os: ubuntu-20.04
-            python-version: "3.10"
-            cibw-build: "cp310-manylinux_x86_64"
-          - os: ubuntu-20.04
-            python-version: "3.11"
-            cibw-build: "cp311-manylinux_x86_64"
-          - os: macos-11
-            python-version: "3.8"
-            cibw-build: "cp38-macosx_x86_64"
-          - os: macos-11
-            python-version: "3.9"
-            cibw-build: "cp39-macosx_x86_64"
-          - os: macos-11
-            python-version: "3.10"
-            cibw-build: "cp310-macosx_x86_64"
-          - os: macos-11
-            python-version: "3.11"
-            cibw-build: "cp311-macosx_x86_64"
+            cibw-build: "cp39-macosx_arm64"
+            hw: "arm64"
+        #   - os: macos-11
+        #     python-version: "3.10"
+        #     cibw-build: "cp310-macosx_arm64"
+        #     hw: "arm64"
+        #   - os: macos-11
+        #     python-version: "3.11"
+        #     cibw-build: "cp311-macosx_arm64"
+        #     hw: "arm64"
     steps:
       - uses: actions/checkout@v3
 
@@ -51,11 +79,13 @@ jobs:
           # configure cibuildwheel to build native archs ('auto'), and some
           # emulated ones
           CIBW_ARCHS_LINUX: native
+          CIBW_ARCHS_MACOS: ${{ matrix.hw }}
+
           CIBW_MANYLINUX_X86_64_IMAGE: "registry-1.docker.io/tuplex/ci:${{ matrix.python-version }}"
           CIBW_BUILD: ${{ matrix.cibw-build }}
 
           # macOS dependencies separate, for linux use docker tuplex/ci:3.x images.
-          CIBW_BEFORE_ALL_MACOS: bash ./scripts/macos/install_antlr4_cpp_runtime.sh && bash ./scripts/macos/brew_dependencies.sh && bash ./scripts/macos/install_aws-sdk-cpp.sh && echo 'export PATH="/usr/local/opt/openjdk@11/bin:$PATH"' >> /Users/runner/.bash_profile
+          #CIBW_BEFORE_ALL_MACOS: bash ./scripts/macos/install_antlr4_cpp_runtime.sh && bash ./scripts/macos/brew_dependencies.sh && bash ./scripts/macos/install_aws-sdk-cpp.sh && echo 'export PATH="/usr/local/opt/openjdk@11/bin:$PATH"' >> /Users/runner/.bash_profile
 
           # bundle aws runner with linux wheel, remove environment variable TUPLEX_LAMBDA_ZIP to remove runner.
           CIBW_ENVIRONMENT_LINUX: "TUPLEX_LAMBDA_ZIP='./tuplex/python/tuplex/other/tplxlam.zip' CMAKE_ARGS='-DBUILD_WITH_AWS=ON -DBUILD_WITH_ORC=ON' LD_LIBRARY_PATH=/usr/local/lib:/opt/lib"
@@ -69,4 +99,4 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           path: |
-            ./wheelhouse/*.whl
+            ./wheelhouse/*.whl
diff --git a/tuplex/CMakeLists.txt b/tuplex/CMakeLists.txt
@@ -1,6 +1,22 @@
-# (c) 2017 Leonhard Spiegelberg
+# (c) 2017-2023 Leonhard Spiegelberg
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
+# top-level language specification
+# enable c++17
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+message(STATUS "Using language version: C++${CMAKE_CXX_STANDARD}")
+
+# add cmake modules from cmake folder
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
+
+# use vcpkg as manager from https://github.com/bitmeal/vcpkg-cmake-integration
+#set(VCPKG_VERSION edge) # optional
+include("${CMAKE_SOURCE_DIR}/cmake/vcpkg.cmake")
+
+
+
+
 # Tuplex build options:
 # =====================
 
@@ -36,6 +52,16 @@ if(CMAKE_GENERATOR STREQUAL "Ninja")
     message(STATUS "Using ninja generator, if fails use -w dupbuild=err")
 endif()
 
+# The -fvisibility=hidden option only works for static builds.
+if (NOT BUILD_SHARED_LIBS)
+    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+else()
+    if (CMAKE_CXX_VISIBILITY_PRESET STREQUAL "hidden")
+        message(FATAL_ERROR "CMAKE_CXX_VISIBILITY_PRESET=hidden is incompatible \
+                           with BUILD_SHARED_LIBS.")
+    endif()
+endif()
+
 # detect MacOS Version because at least 10.13 is required when building with AWS SDK
 if(APPLE)
     execute_process(COMMAND bash -c "sw_vers | grep -Eo '([0-9]{1,}\\.)+[0-9]{1,}' | head -1" OUTPUT_VARIABLE MACOSX_VERSION_STRING OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -73,14 +99,6 @@ endif()
 # uncomment to get verbose cmake output
 # set(CMAKE_VERBOSE_MAKEFILE ON)
 
-# top-level language specification
-# enable c++17
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-message(STATUS "Using language version: C++${CMAKE_CXX_STANDARD}")
-
-# add cmake modules from cmake folder
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
 message(STATUS "additional cmake module path is ${CMAKE_MODULE_PATH}")
 include("${CMAKE_SOURCE_DIR}/cmake/ucm.cmake") #handy package to manipulate compiler flags
 include("${CMAKE_SOURCE_DIR}/cmake/CPM.cmake") # package manager from https://github.com/cpm-cmake/CPM.cmake
@@ -985,22 +1003,26 @@ endif()
 
 # ncurses/curses lib for terminal manipulation
 find_package(Curses REQUIRED)
+find_package(fmt REQUIRED)
+find_package(spdlog REQUIRED)
 
 # add subdirs here...
 add_subdirectory(io)  # <-- make sure to call this first, because it changes parent scope with io dependencies
 add_subdirectory(utils)
-add_subdirectory(test)
 add_subdirectory(codegen)
 add_subdirectory(core)
 add_subdirectory(python)
 add_subdirectory(runtime)
 add_subdirectory(adapters)
-
 # can only build aws lambda on linux platform
 if(LINUX AND BUILD_WITH_AWS)
     # removed AWS lambda implementation, can be found on separate branch
-     add_subdirectory(awslambda)
+    add_subdirectory(awslambda)
 endif()
+# call test dir last to get vars from before
+add_subdirectory(test)
+
+
 
 ###########################################################################
 # (7) Additional flags