Skip to content

[openblas] Ensure we build without lapack on all platforms #6542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 2 commits into from
May 21, 2019
Merged

[openblas] Ensure we build without lapack on all platforms #6542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b76fc3
[openblas] Ensure we build without lapack on all platforms
May 20, 2019
13af2c3
[openblas] Bump version number
May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/openblas/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: openblas
Version: 0.3.6-1
Version: 0.3.6-2
Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
22 changes: 17 additions & 5 deletions ports/openblas/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ vcpkg_find_acquire_program(PERL)
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${SED_EXE_PATH}")

set(COMMON_OPTIONS
-DBUILD_WITHOUT_LAPACK=ON)

# for UWP version, must build non uwp first for helper
# binaries.
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
Expand All @@ -51,7 +54,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON
OPTIONS
${COMMON_OPTIONS}
-DTARGET=NEHALEM
)

# add just built path to environment for gen_config_h.exe,
Expand All @@ -67,17 +72,24 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DVS_WINRT_COMPONENT=TRUE -DBUILD_WITHOUT_LAPACK=ON
"-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel")
OPTIONS
${COMMON_OPTIONS}
-DCMAKE_SYSTEM_PROCESSOR=AMD64
-DVS_WINRT_COMPONENT=TRUE
"-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel")

elseif(NOT VCPKG_CMAKE_SYSTEM_NAME)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DBUILD_WITHOUT_LAPACK=ON)
OPTIONS
${COMMON_OPTIONS})
else()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DNOFORTRAN=ON)
OPTIONS
${COMMON_OPTIONS}
-DCMAKE_SYSTEM_PROCESSOR=AMD64
-DNOFORTRAN=ON)
endif()


Expand Down