[numpy] add new port #37409
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 73056dc2e9..56356bf354 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -14,6 +14,12 @@ set( | ||
| set(CMAKE_STATIC_LIBRARY_PREFIX "lib${LIBRARY_PREFIX}") | ||
| set(CMAKE_SHARED_LIBRARY_PREFIX "lib${LIBRARY_PREFIX}") | ||
|
|
||
| +if(WIN32 AND CMAKE_GNUtoMS) | ||
| + set(CMAKE_STATIC_LIBRARY_PREFIX "") | ||
| + set(CMAKE_SHARED_LIBRARY_PREFIX "lib") | ||
| + set(CMAKE_IMPORT_LIBRARY_PREFIX "") | ||
| +endif() | ||
| + | ||
| # Add the CMake directory for custom CMake modules | ||
| set(CMAKE_MODULE_PATH "${LAPACK_SOURCE_DIR}/CMAKE" ${CMAKE_MODULE_PATH}) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index c99d71a267..34fd8445b1 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -697,3 +697,8 @@ if(BUILD_HTML_DOCUMENTATION OR BUILD_MAN_DOCUMENTATION) | ||
|
|
||
| endif() | ||
| endif() | ||
| + | ||
| +message(STATUS "CMAKE_C_IMPLICIT_LINK_LIBRARIES:${CMAKE_C_IMPLICIT_LINK_LIBRARIES}") | ||
| +message(STATUS "CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES:${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}") | ||
| +message(STATUS "CMAKE_C_IMPLICIT_LINK_DIRECTORIES:${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}") | ||
| +message(STATUS "CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES:${CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES}") | ||
| \ No newline at end of file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| diff --git a/numpy/testing/_private/extbuild.py b/numpy/testing/_private/extbuild.py | ||
| index 292060e76f..49dd3b3556 100644 | ||
| --- a/numpy/testing/_private/extbuild.py | ||
| +++ b/numpy/testing/_private/extbuild.py | ||
| @@ -182,7 +182,7 @@ def _c_compile(cfile, outputfilename, include_dirs=[], libraries=[], | ||
| library_dirs=[]): | ||
| if sys.platform == 'win32': | ||
| compile_extra = ["/we4013"] | ||
| + link_extra = ["/LIBPATH:" + os.path.join(sys.base_prefix, '../../lib')] | ||
| - link_extra = ["/LIBPATH:" + os.path.join(sys.base_prefix, 'libs')] | ||
| elif sys.platform.startswith('linux'): | ||
| compile_extra = [ | ||
| "-O0", "-g", "-Werror=implicit-function-declaration", "-fPIC"] | ||
| @@ -229,17 +229,19 @@ def build(cfile, outputfilename, compile_extra, link_extra, | ||
| name_suffix: 'dummy', | ||
| ) | ||
| """)) | ||
| + meson = os.environ.get('MESON', "meson.py") | ||
| + | ||
| if sys.platform == "win32": | ||
| - subprocess.check_call(["meson", "setup", | ||
| + subprocess.check_call([sys.executable, meson, "setup", | ||
| "--buildtype=release", | ||
| "--vsenv", ".."], | ||
| cwd=build_dir, | ||
| ) | ||
| else: | ||
| - subprocess.check_call(["meson", "setup", "--vsenv", ".."], | ||
| + subprocess.check_call([sys.executable, meson, "setup", "--vsenv", ".."], | ||
| cwd=build_dir | ||
| ) | ||
| - subprocess.check_call(["meson", "compile"], cwd=build_dir) | ||
| + subprocess.check_call([sys.executable, meson, "compile"], cwd=build_dir) | ||
| os.rename(str(build_dir / so_name) + ".dummy", cfile.parent / so_name) | ||
|
|
||
| def get_so_suffix(): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Numpy includes are stored in the module itself | ||
| set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) | ||
| set(VCPKG_BUILD_TYPE release) # No debug builds required for pure python modules since vcpkg does not install a debug python executable. | ||
|
|
||
| #TODO: Fix E:\vcpkg_folders\numpy\installed\x64-windows-release\tools\python3\Lib\site-packages\numpy\testing\_private\extbuild.py | ||
|
|
||
| vcpkg_get_vcpkg_installed_python(VCPKG_PYTHON3) | ||
| cmake_path(GET VCPKG_PYTHON3 PARENT_PATH VCPKG_PYTHON3_BASEDIR) | ||
|
|
||
| find_program(VCPKG_CYTHON NAMES cython PATHS "${VCPKG_PYTHON3_BASEDIR}" "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/Scripts" NO_DEFAULT_PATH) | ||
|
|
||
| set(ENV{PYTHON3} "${VCPKG_PYTHON3}") | ||
| set(PYTHON3 "${VCPKG_PYTHON3}") | ||
|
|
||
| cmake_path(GET SCRIPT_MESON PARENT_PATH MESON_DIR) | ||
| vcpkg_add_to_path(PREPEND "${VCPKG_PYTHON3_BASEDIR}") | ||
| if(VCPKG_TARGET_IS_WINDOWS) | ||
| cmake_path(GET VCPKG_CYTHON PARENT_PATH CYTHON_DIR) | ||
| vcpkg_add_to_path(PREPEND "${CYTHON_DIR}") | ||
| endif() | ||
|
|
||
| cmake_path(GET SCRIPT_MESON PARENT_PATH MESON_DIR) | ||
| set(ENV{MESON} "${SCRIPT_MESON}") | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO numpy/numpy | ||
| REF v${VERSION} | ||
| SHA512 01b6a124c72d082f1dafdd98cdaaa84ab57f2bf0112d89d9355fa458a04deb8309c7e78449767429049971793c040e51412060681218a51c671ac6086dba2fa4 | ||
| HEAD_REF main | ||
| PATCHES | ||
| fix-tests.patch | ||
| ) | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH_SIMD | ||
| REPO intel/x86-simd-sort | ||
| REF 0631a88763a4a0a4c9e84d5eeb0ec5d36053730b | ||
| SHA512 cd44796fc10e13004932be05d5bee46070e061bcc429c7ee8d9e11520e18c45bdec2f4fcd3555d9769891a763e151b0a0a4c00385ea30f24c99da1c65d736e39 | ||
| HEAD_REF main | ||
| ) | ||
|
|
||
| file(COPY "${SOURCE_PATH_SIMD}/" DESTINATION "${SOURCE_PATH}/numpy/core/src/npysort/x86-simd-sort") | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH_MESON_NUMPY | ||
| REPO numpy/meson | ||
| REF 4e370ca8ab73c07f7b84abe8a4b937caace050a4 | ||
| SHA512 dec6e3b9428f95790f85a863778227a73e4f432f8f54e87d61fd6499b5a0723c59a334fcaf880afd59ae50c924d8f2cfa340a143f752cb39f976c731ca0ea123 | ||
| HEAD_REF main | ||
| ) | ||
|
|
||
| file(COPY "${SOURCE_PATH_MESON_NUMPY}/mesonbuild/modules/features" DESTINATION "${MESON_DIR}/mesonbuild/modules") | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH_SVML | ||
| REPO numpy/SVML | ||
| REF 1b21e453f6b1ba6a6aca392b1d810d9d41576123 | ||
| SHA512 c9ea7bf9effbf5750750ddfdfc7db3d95614ed176bd4540d68eddb90a15f819510e9564c9454ef34be02dd6a8e48a7f292a70cb5b63c25c3d1c450a8e3b77d35 | ||
| HEAD_REF main | ||
| ) | ||
|
|
||
| file(COPY "${SOURCE_PATH_SVML}/" DESTINATION "${SOURCE_PATH}/numpy/core/src/umath/svml") | ||
|
|
||
| vcpkg_replace_string("${SOURCE_PATH}/meson.build" "py.dependency()" "dependency('python-3.${PYTHON3_VERSION_MINOR}', method : 'pkg-config')") | ||
|
|
||
| #debug replacement | ||
| vcpkg_replace_string("${SOURCE_PATH}/numpy/_build_utils/tempita.py" "import argparse" "import argparse\nprint(sys.executable)\nimport os\n | ||
| print(os.environ['PATH'])") | ||
|
|
||
| if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CROSSCOMPILING AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") | ||
| set(opts | ||
| ADDITIONAL_PROPERTIES | ||
| "longdouble_format = 'IEEE_DOUBLE_LE'" | ||
| ) | ||
| endif() | ||
|
|
||
| vcpkg_generate_meson_cmd_args( | ||
| OUTPUT meson_opts | ||
| CONFIG RELEASE | ||
| LANGUAGES C;CXX | ||
| ${opts} | ||
| ) | ||
|
|
||
| z_vcpkg_setup_pkgconfig_path(CONFIG "RELEASE") | ||
|
|
||
| list(APPEND meson_opts "--python.platlibdir" "${CURRENT_INSTALLED_DIR}/lib") | ||
| list(JOIN meson_opts "\",\"" meson_opts) | ||
|
|
||
| set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") | ||
| file(REMOVE_RECURSE "${build_dir}") | ||
| file(MAKE_DIRECTORY "${build_dir}") | ||
|
|
||
| vcpkg_python_build_and_install_wheel( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| --config-json "{\"setup-args\" : [\"-Dblas=blas\", \"-Dlapack=lapack\", \"-Duse-ilp64=false\", \"-Dallow-noblas=true\", \"${meson_opts}\" ], \"build-dir\" : \"${build_dir}\" }" | ||
| ) | ||
|
|
||
|
|
||
| # message(STATUS "PATH is: '$ENV{PATH}'") | ||
| # vcpkg_configure_meson( | ||
| # SOURCE_PATH "${SOURCE_PATH}" | ||
| # OPTIONS | ||
| # -Dblas=blas | ||
| # -Dlapack=lapack | ||
| # #-Duse-ilp64=true | ||
| # ADDITIONAL_BINARIES | ||
| # cython=['${VCPKG_CYTHON}'] | ||
| # python3=['${VCPKG_PYTHON3}'] | ||
| # python=['${VCPKG_PYTHON3}'] | ||
| # ${opts} | ||
| # ) | ||
| # message(STATUS "PATH is: '$ENV{PATH}'") | ||
| # vcpkg_install_meson() | ||
| # message(STATUS "PATH is: '$ENV{PATH}'") | ||
| # vcpkg_fixup_pkgconfig() | ||
|
|
||
| # #E:\vcpkg_folders\numpy\packages\numpy_arm64-windows-release\tools\python3\Lib\site-packages\numpy\__config__.py | ||
| # # "path": r"E:/vcpkg_folders/numpy/installed/x64-windows-release/tools/python3/python.exe", and full paths to compilers | ||
| # #"commands": "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.39.33519/bin/Hostx64/arm64/cl.exe, -DWIN32, -D_WINDOWS, -W3, -utf-8, -MP, -MD, -O2, -Oi, -Gy, -DNDEBUG, -Z7", | ||
|
|
||
| find_program(REAL_PYTHON3_LOCATION NAMES python${PYTHON3_VERSION_MAJOR}.${PYTHON3_VERSION_MINOR} python${PYTHON3_VERSION_MAJOR} python PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/python3" PATH_SUFFIXES "bin" NO_DEFAULT_PATH) | ||
| file(TO_NATIVE_PATH "${REAL_PYTHON3_LOCATION}" REAL_PYTHON3_LOCATION) | ||
|
|
||
|
|
||
| set(subdir "${CURRENT_PACKAGES_DIR}/${PYTHON3_SITE}/") | ||
| set(pyfile "${subdir}/numpy/__config__.py") | ||
| file(READ "${pyfile}" contents) | ||
| string(REPLACE "${CURRENT_INSTALLED_DIR}" "$(prefix)" contents "${contents}") | ||
| string(REPLACE "r\"${REAL_PYTHON3_LOCATION}\"" "sys.executable" contents "${contents}") | ||
| file(WRITE "${pyfile}" "import sys\n${contents}") | ||
|
|
||
|
|
||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") | ||
|
|
||
| vcpkg_python_test_import(MODULE "numpy") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "name": "numpy", | ||
| "version": "1.26.4", | ||
| "description": "The fundamental package for scientific computing with Python.", | ||
| "homepage": "https://www.numpy.org/", | ||
| "license": "BSD-3-Clause", | ||
| "dependencies": [ | ||
| "blas", | ||
| "lapack", | ||
| { | ||
| "name": "py-cython", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "py-meson", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "py-setuptools", | ||
| "host": true | ||
| }, | ||
| "python3", | ||
| { | ||
| "name": "python3", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-python-scripts", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-tool-meson", | ||
| "host": true | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just items to be removed from another list.