Set state to be 2023.1.0 plus patch for FindPython3.cmake: second attemp

ilya-lavrenov · Sep 21, 2023 · a5db0c8 · a5db0c8
1 parent b18dc6c
commit a5db0c8
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/recipe/patches/001-python-osx-arm64.patch b/recipe/patches/001-python-osx-arm64.patch
@@ -386,7 +386,7 @@ index f065b9ca4d..49d4c92f09 100644
                  DEPENDS ${onnx_gen_script} "${SRC}/${in_file}"
                  COMMENT "Generate ${rel_out_name}"
 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 1f7d3a5357..debd39fc5d 100644
+index 6799a559f1..debd39fc5d 100644
 --- a/docs/CMakeLists.txt
 +++ b/docs/CMakeLists.txt
 @@ -66,7 +66,7 @@ function(build_docs)
@@ -398,11 +398,13 @@ index 1f7d3a5357..debd39fc5d 100644
          --input_dir=${OpenVINO_SOURCE_DIR}
          --output_dir=${DOCS_BUILD_DIR}/openvino
          --exclude_dir=${DOCS_BUILD_DIR})
-@@ -77,7 +77,7 @@ function(build_docs)
+@@ -76,8 +76,8 @@ function(build_docs)
+     # build with openvino notebooks
      if(ENABLE_OPENVINO_NOTEBOOKS)
          set(NBDOC_SCRIPT "${DOCS_SOURCE_DIR}/nbdoc/nbdoc.py")
-         list(PREPEND commands
+-        list(APPEND commands
 -            COMMAND ${PYTHON_EXECUTABLE} "${NBDOC_SCRIPT}" "${DOCS_SOURCE_DIR}/notebooks" "${RST_OUTPUT}/notebooks"
++        list(PREPEND commands
 +            COMMAND ${Python3_EXECUTABLE} "${NBDOC_SCRIPT}" "${DOCS_SOURCE_DIR}/notebooks" "${RST_OUTPUT}/notebooks"
          )
      endif()
@@ -933,7 +935,7 @@ index 9ddfa9e075..e14e82a55f 100644
              Creates an inference request object used to infer the compiled model.
              The created request has allocated input and output tensors.
 diff --git a/src/bindings/python/wheel/CMakeLists.txt b/src/bindings/python/wheel/CMakeLists.txt
-index 0641f6f788..d2cc6f348a 100644
+index 3311380557..04abc34289 100644
 --- a/src/bindings/python/wheel/CMakeLists.txt
 +++ b/src/bindings/python/wheel/CMakeLists.txt
 @@ -6,11 +6,11 @@
@@ -951,7 +953,7 @@ index 0641f6f788..d2cc6f348a 100644
                  OUTPUT_VARIABLE PLATFORM_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
 
  # defines wheel architecture part of `PLATFORM_TAG`
-@@ -81,7 +81,7 @@ set(openvino_wheel_path "${openvino_wheels_output_dir}/${openvino_wheel_name}")
+@@ -86,7 +86,7 @@ set(openvino_wheel_path "${openvino_wheels_output_dir}/${openvino_wheel_name}")
  # create target for openvino.wheel
  #
 
@@ -960,7 +962,7 @@ index 0641f6f788..d2cc6f348a 100644
                  OUTPUT_VARIABLE pip_version OUTPUT_STRIP_TRAILING_WHITESPACE)
 
  string(REGEX MATCH "pip[ ]+([\\.0-9]*)" pip_version "${pip_version}")
-@@ -89,7 +89,7 @@ set(pip_version ${CMAKE_MATCH_1})
+@@ -94,7 +94,7 @@ set(pip_version ${CMAKE_MATCH_1})
 
  if(pip_version VERSION_GREATER_EQUAL 22.0)
      set(wheel_build_command
@@ -969,7 +971,7 @@ index 0641f6f788..d2cc6f348a 100644
              --no-deps
              --wheel-dir ${openvino_wheels_output_dir}
              # --verbose
-@@ -98,7 +98,7 @@ if(pip_version VERSION_GREATER_EQUAL 22.0)
+@@ -103,7 +103,7 @@ if(pip_version VERSION_GREATER_EQUAL 22.0)
              "${CMAKE_CURRENT_SOURCE_DIR}")
  else()
      set(wheel_build_command
@@ -978,7 +980,7 @@ index 0641f6f788..d2cc6f348a 100644
              --quiet
              --no-user-cfg
              bdist_wheel
-@@ -119,7 +119,7 @@ add_custom_command(OUTPUT ${openvino_wheel_path}
+@@ -124,7 +124,7 @@ add_custom_command(OUTPUT ${openvino_wheel_path}
  set(fdupes_report ${CMAKE_CURRENT_BINARY_DIR}/fdupes_report.txt)
  add_custom_command(OUTPUT "${fdupes_report}"
      COMMAND ${CMAKE_COMMAND}