Merge branch 'main' of github.com:elastic/ml-cpp into pytorch_2_1_0

elastic · edsavage · Jan 10, 2024 · Oct 19, 2023 · Oct 24, 2023 · Oct 24, 2023
commit b25d73860d5c19ea002194b15f8978b79f0a1102
diff --git a/.buildkite/pipelines/run_qa_tests.yml.sh b/.buildkite/pipelines/run_qa_tests.yml.sh
@@ -21,5 +21,5 @@ steps:
     build:
      message: "${BUILDKITE_MESSAGE}"
       env:
-        QAF_TESTS_TO_RUN: "test1,test2,test3"
+        QAF_TESTS_TO_RUN: "ml_cpp_pr"
 EOL
diff --git a/3rd_party/3rd_party.cmake b/3rd_party/3rd_party.cmake
@@ -86,11 +86,7 @@ elseif ("${HOST_SYSTEM_NAME}" STREQUAL "linux")
     set(OMP_PATTERN "libgomp")
     set(OMP_EXTENSION ".so.1")
     set(ZLIB_LOCATION)
-    if( "${ARCH}" STREQUAL "aarch64" )
-      set(TORCH_LIBRARIES "libtorch_cpu" "libc10")
-    else()
-      set(TORCH_LIBRARIES "libtorch_cpu" "libc10" "libintel-ext-pt-cpu")
-    endif()
+    set(TORCH_LIBRARIES "libtorch_cpu" "libc10")
     set(TORCH_LOCATION "/usr/local/gcc103/lib")
     set(TORCH_EXTENSION ".so")
   elseif("$ENV{CPP_CROSS_COMPILE}" STREQUAL "macosx")

diff --git a/3rd_party/licenses/ipex-INFO.csv b/3rd_party/licenses/ipex-INFO.csv
diff --git a/3rd_party/licenses/ipex-LICENSE.txt b/3rd_party/licenses/ipex-LICENSE.txt
diff --git a/3rd_party/licenses/ipex-NOTICE.txt b/3rd_party/licenses/ipex-NOTICE.txt
diff --git a/bin/pytorch_inference/CMakeLists.txt b/bin/pytorch_inference/CMakeLists.txt
@@ -11,33 +11,15 @@
 
 project("ML PyTorch Inference")
 
-# IPEX is required on Linux x86_64 architecture
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
-  set(LINK_IPEX ON)
-endif()
-
-if (LINK_IPEX)
-  set(ML_LINK_LIBRARIES 
-    ${Boost_LIBRARIES}
-    MlCore
-    MlApi
-    MlSeccomp
-    MlVer
-    ${TORCH_LIB}
-    ${C10_LIB}
-    ${IPEX_LIB} 
-    )
-else()
-  set(ML_LINK_LIBRARIES 
-    ${Boost_LIBRARIES}
-    MlCore
-    MlApi
-    MlSeccomp
-    MlVer
-    ${TORCH_LIB}
-    ${C10_LIB}
-    )
-endif()
+set(ML_LINK_LIBRARIES 
+  ${Boost_LIBRARIES}
+  MlCore
+  MlApi
+  MlSeccomp
+  MlVer
+  ${TORCH_LIB}
+  ${C10_LIB}
+  )
 
 ml_add_executable(pytorch_inference
   CBufferedIStreamAdapter.cc

diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -118,7 +118,7 @@ spec:
         build_branches: true
         build_pull_request_forks: true
         cancel_deleted_branch_builds: true
-        filter_condition: build.branch == "main" || build.branch == "8.11" || build.branch == "8.10" || build.branch == "7.17"
+        filter_condition: build.branch == "main" || build.branch == "8.12" || build.branch == "8.11" || build.branch == "7.17"
         filter_enabled: true
         publish_blocked_as_pending: true
         publish_commit_status: false
@@ -130,14 +130,14 @@ spec:
           branch: '7.17'
           cronline: 30 03 * * *
           message: Daily SNAPSHOT build for 7.17 
-        Daily 8_10:
-          branch: '8.10'
-          cronline: 30 02 * * *
-          message: Daily SNAPSHOT build for 8.10 
         Daily 8_11:
           branch: '8.11'
-          cronline: 30 01 * * *
+          cronline: 30 02 * * *
           message: Daily SNAPSHOT build for 8.11 
+        Daily 8_12:
+          branch: '8.12'
+          cronline: 30 01 * * *
+          message: Daily SNAPSHOT build for 8.12 
         Daily main:
           branch: main
           cronline: 30 00 * * *

diff --git a/cmake/variables.cmake b/cmake/variables.cmake
@@ -105,10 +105,6 @@ else()
   set(C10_LIB   "${ML_BASE_PATH}/lib/libc10${ML_LIBEXT}")
 endif()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(IPEX_LIB "${ML_BASE_PATH}/lib/libintel-ext-pt-cpu${ML_LIBEXT}")
-endif()
-
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   set(LIBXML2_LIBRARIES "-lxml2")
 else()

diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
@@ -28,6 +28,14 @@
 
 //=== Regressions
 
+== {es} version 8.13.0
+
+=== Enhancements
+
+=== Bug Fixes
+
+* Remove dependency on the IPEX library (See {ml-pull}#2605[2605] and {ml-pull}#2606[2606].)
+
 == {es} version 8.12.0
 
 === Enhancements
@@ -42,6 +50,13 @@
 
 * Ensure the estimated latitude is within the allowed range (See {ml-pull}#2586[2586].)
 
+== {es} version 8.11.2
+
+=== Enhancements
+
+* Improve forecasting for time series with step changes. (See {ml-pull}#2591[2591],
+  issue: {ml-issue}2466[#2466]).
+
 == {es} version 8.11.0
 
 === Enhancements

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.daemon=false
 
-elasticsearchVersion=8.12.0
+elasticsearchVersion=8.13.0
 
 artifactName=ml-cpp