Merge 4d8c997 into a022003

Author: donhardman

.github/workflows/pack_publish.yml

@@ -30,7 +30,39 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
+  check_branch:
+    name: Check branch existence
+    runs-on: ubuntu-22.04
+    outputs:
+      columnar_locator: ${{ steps.set_locator.outputs.columnar_locator }}
+    steps:
+      - name: Check if branch exists in manticoresoftware/manticoresearch
+        id: check_branch
+        if: github.ref_name != 'master'
+        run: |
+          # Extract the actual branch name for pull requests
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+          else
+            BRANCH_NAME="${{ github.ref_name }}"
+          fi
+          
+          HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://api.github.com/repos/manticoresoftware/columnar/branches/$BRANCH_NAME)
+          if [ "$HTTP_STATUS" -eq "200" ]; then
+            echo "branch_exists=true" >> $GITHUB_OUTPUT
+            echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          else
+            echo "branch_exists=false" >> $GITHUB_OUTPUT
+            echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          fi
+      - name: Set Columnar Locator
+        id: set_locator
+        run: |
+          if [[ "${{ github.ref_name }}" != "master" && "${{ steps.check_branch.outputs.branch_exists }}" == "true" ]]; then
+            echo "columnar_locator=GIT_REPOSITORY https://github.com/manticoresoftware/columnar.git GIT_TAG ${{ steps.check_branch.outputs.branch_name }}" >> $GITHUB_OUTPUT
+          else
+            echo "columnar_locator=" >> $GITHUB_OUTPUT
+          fi
   pack:
     name: OK to pack?
     runs-on: ubuntu-22.04
@@ -112,14 +144,15 @@ jobs:
   pack_debian_ubuntu:
     name: Debian/Ubuntu packages
     uses: ./.github/workflows/build_template.yml
-    needs: pack
+    needs: [pack, check_branch]
     if: needs.pack.outputs.should_continue == 'true'
     strategy:
       fail-fast: false
       matrix:
         DISTR: [bionic, focal, jammy, buster, bullseye, bookworm]
         arch: [x86_64, aarch64]
     with:
+      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
       DISTR: ${{ matrix.DISTR }}
       arch: ${{ matrix.arch }}
       cmake_command: |
@@ -136,14 +169,15 @@ jobs:
   pack_rhel:
     name: RHEL packages
     uses: ./.github/workflows/build_template.yml
-    needs: pack
+    needs: [pack, check_branch]
     if: needs.pack.outputs.should_continue == 'true'
     strategy:
       fail-fast: false
       matrix:
         DISTR: [rhel7, rhel8, rhel9]
         arch: [x86_64, aarch64]
     with:
+      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
       DISTR: ${{ matrix.DISTR }}
       arch: ${{ matrix.arch }}
       boost_url_key: boost_rhel_feb17
@@ -163,14 +197,15 @@ jobs:
   pack_macos:
     name: MacOS packages
     uses: ./.github/workflows/build_template.yml
-    needs: pack
+    needs: [pack, check_branch]
     if: needs.pack.outputs.should_continue == 'true'
     strategy:
       fail-fast: false
       matrix:
         DISTR: [macos]
         arch: [x86_64, arm64]
     with:
+      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
       DISTR: ${{ matrix.DISTR }}
       arch: ${{ matrix.arch }}
       HOMEBREW_PREFIX: /opt/homebrew
@@ -188,9 +223,10 @@ jobs:
   pack_windows:
     name: Windows x64 package
     uses: ./.github/workflows/build_template.yml
-    needs: pack
+    needs: [pack, check_branch]
     if: needs.pack.outputs.should_continue == 'true'
     with:
+      COLUMNAR_LOCATOR: ${{ needs.check_branch.outputs.columnar_locator }}
       DISTR: windows
       arch: x64
       sysroot_url_key: roots_mysql83_jan17

cmake/GetColumnar.cmake

@@ -40,6 +40,7 @@ endif()
 set ( LIB_MANTICORE_COLUMNAR "lib_manticore_columnar.${EXTENSION}" )
 set ( LIB_MANTICORE_SECONDARY "lib_manticore_secondary.${EXTENSION}" )
 set ( LIB_MANTICORE_KNN "lib_manticore_knn.${EXTENSION}" )
+set ( LIB_MANTICORE_KNN_EMBEDDINGS "lib_manticore_knn_embeddings.${EXTENSION}" )
 
 macro ( backup_paths )
 	set ( _CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH}" )

config/config_cmake.h.in

@@ -161,6 +161,9 @@
 /* default name of knn search shared library */
 #cmakedefine LIB_MANTICORE_KNN "${LIB_MANTICORE_KNN}"
 
+/* default name of knn embeddings shared library */
+#cmakedefine LIB_MANTICORE_KNN_EMBEDDINGS "${LIB_MANTICORE_KNN_EMBEDDINGS}"
+
 /* define to set custom directory for shared files. Absolute as /usr/local/share/manticore */
 #define FULL_SHARE_DIR "${FULL_SHARE_DIR}"