Merge branch 'master' into vcpkg_nuget

6 files changed, 862 insertions, 9 deletions

diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL
index dd4e01732..14efa12f9 100644
--- a/ports/openblas/CONTROL
+++ b/ports/openblas/CONTROL
@@ -1,4 +1,5 @@
 Source: openblas
-Version: 0.3.6-2
+Version: 0.3.6-6
 Homepage: https://github.com/xianyi/OpenBLAS
+Build-Depends: pthread (linux)
 Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
diff --git a/ports/openblas/FindBLAS.cmake b/ports/openblas/FindBLAS.cmake
new file mode 100644
index 000000000..164e79f3b
--- /dev/null
+++ b/ports/openblas/FindBLAS.cmake
@@ -0,0 +1,816 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying

+# file Copyright.txt or https://cmake.org/licensing for details.

+

+#[=======================================================================[.rst:

+FindBLAS

+--------

+

+Find Basic Linear Algebra Subprograms (BLAS) library

+

+This module finds an installed Fortran library that implements the

+BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The

+list of libraries searched for is taken from the ``autoconf`` macro file,

+``acx_blas.m4`` (distributed at

+http://ac-archive.sourceforge.net/ac-archive/acx_blas.html).

+

+Input Variables

+^^^^^^^^^^^^^^^

+

+The following variables may be set to influence this module's behavior:

+

+``BLA_STATIC``

+  if ``ON`` use static linkage

+

+``BLA_VENDOR``

+  If set, checks only the specified vendor, if not set checks all the

+  possibilities.  List of vendors valid in this module:

+

+  * Goto

+  * OpenBLAS

+  * FLAME

+  * ATLAS PhiPACK

+  * CXML

+  * DXML

+  * SunPerf

+  * SCSL

+  * SGIMATH

+  * IBMESSL

+  * Intel10_32 (intel mkl v10 32 bit)

+  * Intel10_64lp (intel mkl v10+ 64 bit, threaded code, lp64 model)

+  * Intel10_64lp_seq (intel mkl v10+ 64 bit, sequential code, lp64 model)

+  * Intel10_64ilp (intel mkl v10+ 64 bit, threaded code, ilp64 model)

+  * Intel10_64ilp_seq (intel mkl v10+ 64 bit, sequential code, ilp64 model)

+  * Intel (obsolete versions of mkl 32 and 64 bit)

+  * ACML

+  * ACML_MP

+  * ACML_GPU

+  * Apple

+  * NAS

+  * Generic

+

+``BLA_F95``

+  if ``ON`` tries to find the BLAS95 interfaces

+

+``BLA_PREFER_PKGCONFIG``

+  if set ``pkg-config`` will be used to search for a BLAS library first

+  and if one is found that is preferred

+

+Result Variables

+^^^^^^^^^^^^^^^^

+

+This module defines the following variables:

+

+``BLAS_FOUND``

+  library implementing the BLAS interface is found

+``BLAS_LINKER_FLAGS``

+  uncached list of required linker flags (excluding ``-l`` and ``-L``).

+``BLAS_LIBRARIES``

+  uncached list of libraries (using full path name) to link against

+  to use BLAS (may be empty if compiler implicitly links BLAS)

+``BLAS95_LIBRARIES``

+  uncached list of libraries (using full path name) to link against

+  to use BLAS95 interface

+``BLAS95_FOUND``

+  library implementing the BLAS95 interface is found

+

+.. note::

+

+  C or CXX must be enabled to use Intel Math Kernel Library (MKL)

+

+  For example, to use Intel MKL libraries and/or Intel compiler:

+

+  .. code-block:: cmake

+

+    set(BLA_VENDOR Intel10_64lp)

+    find_package(BLAS)

+

+Hints

+^^^^^

+

+Set ``MKLROOT`` environment variable to a directory that contains an MKL

+installation.

+

+#]=======================================================================]

+

+include(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)

+include(${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake)

+include(${CMAKE_ROOT}/Modules/CMakePushCheckState.cmake)

+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)

+cmake_push_check_state()

+set(CMAKE_REQUIRED_QUIET ${BLAS_FIND_QUIETLY})

+

+set(_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})

+

+# Check the language being used

+if( NOT (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED OR CMAKE_Fortran_COMPILER_LOADED) )

+  if(BLAS_FIND_REQUIRED)

+    message(FATAL_ERROR "FindBLAS requires Fortran, C, or C++ to be enabled.")

+  else()

+    message(STATUS "Looking for BLAS... - NOT found (Unsupported languages)")

+    return()

+  endif()

+endif()

+

+if(BLA_PREFER_PKGCONFIG)

+  find_package(PkgConfig)

+  pkg_check_modules(PKGC_BLAS blas)

+  if(PKGC_BLAS_FOUND)

+    set(BLAS_FOUND ${PKGC_BLAS_FOUND})

+    set(BLAS_LIBRARIES "${PKGC_BLAS_LINK_LIBRARIES}")

+    return()

+  endif()

+endif()

+

+macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread)

+  # This macro checks for the existence of the combination of fortran libraries

+  # given by _list.  If the combination is found, this macro checks (using the

+  # Check_Fortran_Function_Exists macro) whether can link against that library

+  # combination using the name of a routine given by _name using the linker

+  # flags given by _flags.  If the combination of libraries is found and passes

+  # the link test, LIBRARIES is set to the list of complete library paths that

+  # have been found.  Otherwise, LIBRARIES is set to FALSE.

+

+  # N.B. _prefix is the prefix applied to the names of all cached variables that

+  # are generated internally and marked advanced by this macro.

+

+  set(_libdir ${ARGN})

+

+  set(_libraries_work TRUE)

+  set(${LIBRARIES})

+  set(_combined_name)

+  if (NOT _libdir)

+    if (WIN32)

+      set(_libdir ENV LIB)

+    elseif (APPLE)

+      set(_libdir ENV DYLD_LIBRARY_PATH)

+    else ()

+      set(_libdir ENV LD_LIBRARY_PATH)

+    endif ()

+  endif ()

+

+  list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")

+

+  foreach(_library ${_list})

+    set(_combined_name ${_combined_name}_${_library})

+    if(NOT "${_thread}" STREQUAL "")

+        set(_combined_name ${_combined_name}_thread)

+    endif()

+    if(_libraries_work)

+      if (BLA_STATIC)

+        if (WIN32)

+          set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})

+        endif ()

+        if (APPLE)

+          set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})

+        else ()

+          set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})

+        endif ()

+      else ()

+        if (CMAKE_SYSTEM_NAME STREQUAL "Linux")

+          # for ubuntu's libblas3gf and liblapack3gf packages

+          set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)

+        endif ()

+      endif ()

+      find_library(${_prefix}_${_library}_LIBRARY

+        NAMES ${_library}

+        PATHS ${_libdir}

+        )

+      mark_as_advanced(${_prefix}_${_library}_LIBRARY)

+      set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})

+      set(_libraries_work ${${_prefix}_${_library}_LIBRARY})

+    endif()

+  endforeach()

+  if(_libraries_work)

+    # Test this combination of libraries.

+    set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_thread})

+    #  message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")

+    if (CMAKE_Fortran_COMPILER_LOADED)

+      check_fortran_function_exists("${_name}" ${_prefix}${_combined_name}_WORKS)

+    else()

+      check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)

+    endif()

+    set(CMAKE_REQUIRED_LIBRARIES)

+    set(_libraries_work ${${_prefix}${_combined_name}_WORKS})

+  endif()

+  if(_libraries_work)

+    if("${_list}" STREQUAL "")

+      set(${LIBRARIES} "${LIBRARIES}-PLACEHOLDER-FOR-EMPTY-LIBRARIES")

+    else()

+      set(${LIBRARIES} ${${LIBRARIES}} ${_thread})  # for static link

+    endif()

+  else()

+    set(${LIBRARIES} FALSE)

+  endif()

+  #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")

+endmacro()

+

+set(BLAS_LINKER_FLAGS)

+set(BLAS_LIBRARIES)

+set(BLAS95_LIBRARIES)

+if (NOT $ENV{BLA_VENDOR} STREQUAL "")

+  set(BLA_VENDOR $ENV{BLA_VENDOR})

+else ()

+  if(NOT BLA_VENDOR)

+    set(BLA_VENDOR "All")

+  endif()

+endif ()

+

+if (BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    # Implicitly linked BLAS libraries

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      ""

+      ""

+      )

+  endif()

+endif ()

+

+#BLAS in intel mkl 10+ library? (em64t 64bit)

+if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")

+  if (NOT BLAS_LIBRARIES)

+

+    # System-specific settings

+    if (WIN32)

+      if (BLA_STATIC)

+        set(BLAS_mkl_DLL_SUFFIX "")

+      else()

+        set(BLAS_mkl_DLL_SUFFIX "_dll")

+      endif()

+    else()

+      # Switch to GNU Fortran support layer if needed (but not on Apple, where MKL does not provide it)

+      if(CMAKE_Fortran_COMPILER_LOADED AND CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT APPLE)

+          set(BLAS_mkl_INTFACE "gf")

+          set(BLAS_mkl_THREADING "gnu")

+          set(BLAS_mkl_OMP "gomp")

+      else()

+          set(BLAS_mkl_INTFACE "intel")

+          set(BLAS_mkl_THREADING "intel")

+          set(BLAS_mkl_OMP "iomp5")

+      endif()

+      set(BLAS_mkl_LM "-lm")

+      set(BLAS_mkl_LDL "-ldl")

+    endif()

+

+    if (BLA_VENDOR MATCHES "_64ilp")

+      set(BLAS_mkl_ILP_MODE "ilp64")

+    else ()

+      set(BLAS_mkl_ILP_MODE "lp64")

+    endif ()

+

+    if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)

+      if(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)

+        find_package(Threads)

+      else()

+        find_package(Threads REQUIRED)

+      endif()

+

+      set(BLAS_SEARCH_LIBS "")

+

+      if(BLA_F95)

+        set(BLAS_mkl_SEARCH_SYMBOL sgemm_f95)

+        set(_LIBRARIES BLAS95_LIBRARIES)

+        if (WIN32)

+          # Find the main file (32-bit or 64-bit)

+          set(BLAS_SEARCH_LIBS_WIN_MAIN "")

+          if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS_WIN_MAIN

+              "mkl_blas95${BLAS_mkl_DLL_SUFFIX} mkl_intel_c${BLAS_mkl_DLL_SUFFIX}")

+          endif()

+          if (BLA_VENDOR MATCHES "^Intel10_64i?lp" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS_WIN_MAIN

+              "mkl_blas95_${BLAS_mkl_ILP_MODE}${BLAS_mkl_DLL_SUFFIX} mkl_intel_${BLAS_mkl_ILP_MODE}${BLAS_mkl_DLL_SUFFIX}")

+          endif ()

+

+          # Add threading/sequential libs

+          set(BLAS_SEARCH_LIBS_WIN_THREAD "")

+          if (BLA_VENDOR MATCHES "_seq$" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD

+              "mkl_sequential${BLAS_mkl_DLL_SUFFIX}")

+          endif()

+          if (NOT BLA_VENDOR MATCHES "_seq$" OR BLA_VENDOR STREQUAL "All")

+            # old version

+            list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD

+              "libguide40 mkl_intel_thread${BLAS_mkl_DLL_SUFFIX}")

+            # mkl >= 10.3

+            list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD

+              "libiomp5md mkl_intel_thread${BLAS_mkl_DLL_SUFFIX}")

+          endif()

+

+          # Cartesian product of the above

+          foreach (MAIN ${BLAS_SEARCH_LIBS_WIN_MAIN})

+            foreach (THREAD ${BLAS_SEARCH_LIBS_WIN_THREAD})

+              list(APPEND BLAS_SEARCH_LIBS

+                "${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}")

+            endforeach()

+          endforeach()

+        else ()

+          if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")

+            # old version

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_blas95 mkl_${BLAS_mkl_INTFACE} mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")

+

+            # mkl >= 10.3

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_blas95 mkl_${BLAS_mkl_INTFACE} mkl_${BLAS_mkl_THREADING}_thread mkl_core ${BLAS_mkl_OMP}")

+          endif ()

+          if (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR STREQUAL "All")

+            # old version

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_blas95 mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")

+

+            # mkl >= 10.3

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_blas95_${BLAS_mkl_ILP_MODE} mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_${BLAS_mkl_THREADING}_thread mkl_core ${BLAS_mkl_OMP}")

+          endif ()

+          if (BLA_VENDOR MATCHES "^Intel10_64i?lp_seq$" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_blas95_${BLAS_mkl_ILP_MODE} mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_sequential mkl_core")

+          endif ()

+        endif ()

+      else ()

+        set(BLAS_mkl_SEARCH_SYMBOL sgemm)

+        set(_LIBRARIES BLAS_LIBRARIES)

+        if (WIN32)

+          # Find the main file (32-bit or 64-bit)

+          set(BLAS_SEARCH_LIBS_WIN_MAIN "")

+          if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS_WIN_MAIN

+              "mkl_intel_c${BLAS_mkl_DLL_SUFFIX}")

+          endif()

+          if (BLA_VENDOR MATCHES "^Intel10_64i?lp" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS_WIN_MAIN

+              "mkl_intel_${BLAS_mkl_ILP_MODE}${BLAS_mkl_DLL_SUFFIX}")

+          endif ()

+

+          # Add threading/sequential libs

+          set(BLAS_SEARCH_LIBS_WIN_THREAD "")

+          if (NOT BLA_VENDOR MATCHES "_seq$" OR BLA_VENDOR STREQUAL "All")

+            # old version

+            list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD

+              "libguide40 mkl_intel_thread${BLAS_mkl_DLL_SUFFIX}")

+            # mkl >= 10.3

+            list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD

+              "libiomp5md mkl_intel_thread${BLAS_mkl_DLL_SUFFIX}")

+          endif()

+          if (BLA_VENDOR MATCHES "_seq$" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS_WIN_THREAD

+              "mkl_sequential${BLAS_mkl_DLL_SUFFIX}")

+          endif()

+

+          # Cartesian product of the above

+          foreach (MAIN ${BLAS_SEARCH_LIBS_WIN_MAIN})

+            foreach (THREAD ${BLAS_SEARCH_LIBS_WIN_THREAD})

+              list(APPEND BLAS_SEARCH_LIBS

+                "${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}")

+            endforeach()

+          endforeach()

+        else ()

+          if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")

+            # old version

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_${BLAS_mkl_INTFACE} mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")

+

+            # mkl >= 10.3

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_${BLAS_mkl_INTFACE} mkl_${BLAS_mkl_THREADING}_thread mkl_core ${BLAS_mkl_OMP}")

+          endif ()

+          if (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR STREQUAL "All")

+            # old version

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_${BLAS_mkl_THREADING}_thread mkl_core guide")

+

+            # mkl >= 10.3

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_${BLAS_mkl_THREADING}_thread mkl_core ${BLAS_mkl_OMP}")

+          endif ()

+          if (BLA_VENDOR MATCHES "^Intel10_64i?lp_seq$" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_${BLAS_mkl_INTFACE}_${BLAS_mkl_ILP_MODE} mkl_sequential mkl_core")

+          endif ()

+

+          #older vesions of intel mkl libs

+          if (BLA_VENDOR STREQUAL "Intel" OR BLA_VENDOR STREQUAL "All")

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl")

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_ia32")

+            list(APPEND BLAS_SEARCH_LIBS

+              "mkl_em64t")

+          endif ()

+        endif ()

+      endif ()

+

+      if (DEFINED ENV{MKLROOT})

+        if (BLA_VENDOR STREQUAL "Intel10_32")

+          set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/ia32")

+        elseif (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR MATCHES "^Intel10_64i?lp_seq$")

+          set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/intel64")

+        endif ()

+      endif ()

+      if (_BLAS_MKLROOT_LIB_DIR)

+        if (WIN32)

+          string(APPEND _BLAS_MKLROOT_LIB_DIR "_win")

+        elseif (APPLE)

+          string(APPEND _BLAS_MKLROOT_LIB_DIR "_mac")

+        else ()

+          string(APPEND _BLAS_MKLROOT_LIB_DIR "_lin")

+        endif ()

+      endif ()

+

+      foreach (IT ${BLAS_SEARCH_LIBS})

+        string(REPLACE " " ";" SEARCH_LIBS ${IT})

+        if (NOT ${_LIBRARIES})

+          check_fortran_libraries(

+            ${_LIBRARIES}

+            BLAS

+            ${BLAS_mkl_SEARCH_SYMBOL}

+            ""

+            "${SEARCH_LIBS}"

+            "${CMAKE_THREAD_LIBS_INIT};${BLAS_mkl_LM};${BLAS_mkl_LDL}"

+            "${_BLAS_MKLROOT_LIB_DIR}"

+            )

+        endif ()

+      endforeach ()

+

+    endif ()

+    unset(BLAS_mkl_ILP_MODE)

+    unset(BLAS_mkl_INTFACE)

+    unset(BLAS_mkl_THREADING)

+    unset(BLAS_mkl_OMP)

+    unset(BLAS_mkl_DLL_SUFFIX)

+    unset(BLAS_mkl_LM)

+    unset(BLAS_mkl_LDL)

+  endif ()

+endif ()

+

+if(BLA_F95)

+  find_package_handle_standard_args(BLAS REQUIRED_VARS BLAS95_LIBRARIES)

+  set(BLAS95_FOUND ${BLAS_FOUND})

+  if(BLAS_FOUND)

+    set(BLAS_LIBRARIES "${BLAS95_LIBRARIES}")

+  endif()

+endif()

+

+if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    # gotoblas (http://www.tacc.utexas.edu/tacc-projects/gotoblas2)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "goto2"

+      ""

+      )

+  endif()

+endif ()

+

+if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    # OpenBLAS (http://www.openblas.net)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "openblas"

+      ""

+      )

+  endif()

+  if(NOT BLAS_LIBRARIES)

+    find_package(Threads)

+    # OpenBLAS (http://www.openblas.net)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "openblas"

+      "${CMAKE_THREAD_LIBS_INIT}"

+      )

+  endif()

+endif ()

+

+if (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    # FLAME's blis library (https://github.com/flame/blis)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "blis"

+      ""

+      )

+  endif()

+endif ()

+

+if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      dgemm

+      ""

+      "f77blas;atlas"

+      ""

+      )

+  endif()

+endif ()

+

+# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)

+if (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "sgemm;dgemm;blas"

+      ""

+      )

+  endif()

+endif ()

+

+# BLAS in Alpha CXML library?

+if (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "cxml"

+      ""

+      )

+  endif()

+endif ()

+

+# BLAS in Alpha DXML library? (now called CXML, see above)

+if (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "dxml"

+      ""

+      )

+  endif()

+endif ()

+

+# BLAS in Sun Performance library?

+if (BLA_VENDOR STREQUAL "SunPerf" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      "-xlic_lib=sunperf"

+      "sunperf;sunmath"

+      ""

+      )

+    if(BLAS_LIBRARIES)

+      set(BLAS_LINKER_FLAGS "-xlic_lib=sunperf")

+    endif()

+  endif()

+endif ()

+

+# BLAS in SCSL library?  (SGI/Cray Scientific Library)

+if (BLA_VENDOR STREQUAL "SCSL" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "scsl"

+      ""

+      )

+  endif()

+endif ()

+

+# BLAS in SGIMATH library?

+if (BLA_VENDOR STREQUAL "SGIMATH" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "complib.sgimath"

+      ""

+      )

+  endif()

+endif ()

+

+# BLAS in IBM ESSL library? (requires generic BLAS lib, too)

+if (BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "essl;blas"

+      ""

+      )

+  endif()

+endif ()

+

+#BLAS in acml library?

+if (BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All")

+  if( ((BLA_VENDOR STREQUAL "ACML") AND (NOT BLAS_ACML_LIB_DIRS)) OR

+    ((BLA_VENDOR STREQUAL "ACML_MP") AND (NOT BLAS_ACML_MP_LIB_DIRS)) OR

+    ((BLA_VENDOR STREQUAL "ACML_GPU") AND (NOT BLAS_ACML_GPU_LIB_DIRS))

+    )

+  # try to find acml in "standard" paths

+  if( WIN32 )

+    file( GLOB _ACML_ROOT "C:/AMD/acml*/ACML-EULA.txt" )

+  else()

+    file( GLOB _ACML_ROOT "/opt/acml*/ACML-EULA.txt" )

+  endif()

+  if( WIN32 )

+    file( GLOB _ACML_GPU_ROOT "C:/AMD/acml*/GPGPUexamples" )

+  else()

+    file( GLOB _ACML_GPU_ROOT "/opt/acml*/GPGPUexamples" )

+  endif()

+  list(GET _ACML_ROOT 0 _ACML_ROOT)

+  list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT)

+  if( _ACML_ROOT )

+    get_filename_component( _ACML_ROOT ${_ACML_ROOT} PATH )

+    if( SIZEOF_INTEGER EQUAL 8 )

+      set( _ACML_PATH_SUFFIX "_int64" )

+    else()

+      set( _ACML_PATH_SUFFIX "" )

+    endif()

+    if( CMAKE_Fortran_COMPILER_ID STREQUAL "Intel" )

+      set( _ACML_COMPILER32 "ifort32" )

+      set( _ACML_COMPILER64 "ifort64" )

+    elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "SunPro" )

+      set( _ACML_COMPILER32 "sun32" )

+      set( _ACML_COMPILER64 "sun64" )

+    elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "PGI" )

+      set( _ACML_COMPILER32 "pgi32" )

+      if( WIN32 )

+        set( _ACML_COMPILER64 "win64" )

+      else()

+        set( _ACML_COMPILER64 "pgi64" )

+      endif()

+    elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "Open64" )

+      # 32 bit builds not supported on Open64 but for code simplicity

+      # We'll just use the same directory twice

+      set( _ACML_COMPILER32 "open64_64" )

+      set( _ACML_COMPILER64 "open64_64" )

+    elseif( CMAKE_Fortran_COMPILER_ID STREQUAL "NAG" )

+      set( _ACML_COMPILER32 "nag32" )

+      set( _ACML_COMPILER64 "nag64" )

+    else()

+      set( _ACML_COMPILER32 "gfortran32" )

+      set( _ACML_COMPILER64 "gfortran64" )

+    endif()

+

+    if( BLA_VENDOR STREQUAL "ACML_MP" )

+      set(_ACML_MP_LIB_DIRS

+        "${_ACML_ROOT}/${_ACML_COMPILER32}_mp${_ACML_PATH_SUFFIX}/lib"

+        "${_ACML_ROOT}/${_ACML_COMPILER64}_mp${_ACML_PATH_SUFFIX}/lib" )

+    else()

+      set(_ACML_LIB_DIRS

+        "${_ACML_ROOT}/${_ACML_COMPILER32}${_ACML_PATH_SUFFIX}/lib"

+        "${_ACML_ROOT}/${_ACML_COMPILER64}${_ACML_PATH_SUFFIX}/lib" )

+    endif()

+  endif()

+elseif(BLAS_${BLA_VENDOR}_LIB_DIRS)

+  set(_${BLA_VENDOR}_LIB_DIRS ${BLAS_${BLA_VENDOR}_LIB_DIRS})

+endif()

+

+if( BLA_VENDOR STREQUAL "ACML_MP" )

+  foreach( BLAS_ACML_MP_LIB_DIRS ${_ACML_MP_LIB_DIRS})

+    check_fortran_libraries (

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      "" "acml_mp;acml_mv" "" ${BLAS_ACML_MP_LIB_DIRS}

+      )

+    if( BLAS_LIBRARIES )

+      break()

+    endif()

+  endforeach()

+elseif( BLA_VENDOR STREQUAL "ACML_GPU" )

+  foreach( BLAS_ACML_GPU_LIB_DIRS ${_ACML_GPU_LIB_DIRS})

+    check_fortran_libraries (

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      "" "acml;acml_mv;CALBLAS" "" ${BLAS_ACML_GPU_LIB_DIRS}

+      )

+    if( BLAS_LIBRARIES )

+      break()

+    endif()

+  endforeach()

+else()

+  foreach( BLAS_ACML_LIB_DIRS ${_ACML_LIB_DIRS} )

+    check_fortran_libraries (

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      "" "acml;acml_mv" "" ${BLAS_ACML_LIB_DIRS}

+      )

+    if( BLAS_LIBRARIES )

+      break()

+    endif()

+  endforeach()

+endif()

+

+# Either acml or acml_mp should be in LD_LIBRARY_PATH but not both

+if(NOT BLAS_LIBRARIES)

+  check_fortran_libraries(

+    BLAS_LIBRARIES

+    BLAS

+    sgemm

+    ""

+    "acml;acml_mv"

+    ""

+    )

+endif()

+if(NOT BLAS_LIBRARIES)

+  check_fortran_libraries(

+    BLAS_LIBRARIES

+    BLAS

+    sgemm

+    ""

+    "acml_mp;acml_mv"

+    ""

+    )

+endif()

+if(NOT BLAS_LIBRARIES)

+  check_fortran_libraries(

+    BLAS_LIBRARIES

+    BLAS

+    sgemm

+    ""

+    "acml;acml_mv;CALBLAS"

+    ""

+    )

+endif()

+endif () # ACML

+

+# Apple BLAS library?

+if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      dgemm

+      ""

+      "Accelerate"

+      ""

+      )

+  endif()

+endif ()

+

+if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")

+  if ( NOT BLAS_LIBRARIES )

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      dgemm

+      ""

+      "vecLib"

+      ""

+      )

+  endif ()

+endif ()

+

+# Generic BLAS library?

+if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")

+  if(NOT BLAS_LIBRARIES)

+    check_fortran_libraries(

+      BLAS_LIBRARIES

+      BLAS

+      sgemm

+      ""

+      "blas"

+      ""

+      )

+  endif()

+endif ()

+

+if(NOT BLA_F95)

+  find_package_handle_standard_args(BLAS REQUIRED_VARS BLAS_LIBRARIES)

+endif()

+

+# On compilers that implicitly link BLAS (such as ftn, cc, and CC on Cray HPC machines)

+# we used a placeholder for empty BLAS_LIBRARIES to get through our logic above.

+if (BLAS_LIBRARIES STREQUAL "BLAS_LIBRARIES-PLACEHOLDER-FOR-EMPTY-LIBRARIES")

+  set(BLAS_LIBRARIES "")

+endif()

+

+cmake_pop_check_state()

+set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})

diff --git a/ports/openblas/fix-redefinition-function.patch b/ports/openblas/fix-redefinition-function.patch
new file mode 100644
index 000000000..176a29ff3
--- /dev/null
+++ b/ports/openblas/fix-redefinition-function.patch
@@ -0,0 +1,28 @@
+diff --git a/openblas_config_template.h b/openblas_config_template.h
+index 52dd49d..239219d 100644
+--- a/openblas_config_template.h
++++ b/openblas_config_template.h
+@@ -64,6 +64,7 @@ typedef int blasint;
+ #ifndef __cplusplus
+   #include <complex.h>
+ #endif
++  #ifndef OPENBLAS_COMPLEX_STRUCT
+   typedef float _Complex openblas_complex_float;
+   typedef double _Complex openblas_complex_double;
+   typedef xdouble _Complex openblas_complex_xdouble;
+@@ -76,7 +77,9 @@ typedef int blasint;
+   #define openblas_complex_double_imag(z)            (cimag(z))
+   #define openblas_complex_xdouble_real(z)           (creal(z))
+   #define openblas_complex_xdouble_imag(z)           (cimag(z))
++  #endif
+ #else
++  #ifndef OPENBLAS_COMPLEX_STRUCT
+   #define OPENBLAS_COMPLEX_STRUCT
+   typedef struct { float real, imag; } openblas_complex_float;
+   typedef struct { double real, imag; } openblas_complex_double;
+@@ -90,4 +93,5 @@ typedef int blasint;
+   #define openblas_complex_double_imag(z)            ((z).imag)
+   #define openblas_complex_xdouble_real(z)           ((z).real)
+   #define openblas_complex_xdouble_imag(z)           ((z).imag)
++  #endif
+ #endif
diff --git a/ports/openblas/openblas_common.h b/ports/openblas/openblas_common.h
index 10b25d4c7..6652a17e9 100644
--- a/ports/openblas/openblas_common.h
+++ b/ports/openblas/openblas_common.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "openblas_config.h"
+#include "openblas/openblas_config.h"
 
 #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX)
 #define OPENBLAS_WINDOWS_ABI
@@ -57,6 +57,7 @@ typedef int blasint;
    predefined macros with some compilers (e.g. GCC 4.7 on Linux).  This occurs
    as a side effect of including either <features.h> or <stdc-predef.h>. */
 #include <stdio.h>
+#ifndef OPENBLAS_COMPLEX_STRUCT
 #define OPENBLAS_COMPLEX_STRUCT
 typedef struct { float real, imag; } openblas_complex_float;
 typedef struct { double real, imag; } openblas_complex_double;
@@ -70,3 +71,4 @@ typedef struct { xdouble real, imag; } openblas_complex_xdouble;
 #define openblas_complex_double_imag(z)            ((z).imag)
 #define openblas_complex_xdouble_real(z)           ((z).real)
 #define openblas_complex_xdouble_imag(z)           ((z).imag)
+#endif
\ No newline at end of file
diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake
index 1bd7b6157..907ec751a 100644
--- a/ports/openblas/portfile.cmake
+++ b/ports/openblas/portfile.cmake
@@ -1,9 +1,5 @@
 include(vcpkg_common_functions)
 
-if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-    message(FATAL_ERROR "openblas can only be built for x64 currently")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xianyi/OpenBLAS
@@ -13,6 +9,7 @@ vcpkg_from_github(
     PATCHES
         uwp.patch
         fix-space-path.patch
+        fix-redefinition-function.patch
 )
 
 find_program(GIT NAMES git git.cmd)
@@ -26,8 +23,7 @@ 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)
+set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON)
 
 # for UWP version, must build non uwp first for helper
 # binaries.
@@ -68,16 +64,21 @@ if(VCPKG_CMAKE_SYSTEM_NAME  STREQUAL "WindowsStore")
 
 elseif(NOT VCPKG_CMAKE_SYSTEM_NAME)
     vcpkg_configure_cmake(
+        PREFER_NINJA
         SOURCE_PATH ${SOURCE_PATH}
         OPTIONS
             ${COMMON_OPTIONS})
 else()
+    list(APPEND VCPKG_C_FLAGS "-DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _
+    list(APPEND VCPKG_CXX_FLAGS "-DNEEDBUNDERSCORE")
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
         OPTIONS
             ${COMMON_OPTIONS}
             -DCMAKE_SYSTEM_PROCESSOR=AMD64
-            -DNOFORTRAN=ON)
+            -DNOFORTRAN=ON
+            -DBU=_  #required for all blas functions to append extra _ using NAME
+            )
 endif()
 
 
@@ -98,6 +99,9 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/cblas.h "${CBLAS_H}")
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openblas)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/openblas/LICENSE ${CURRENT_PACKAGES_DIR}/share/openblas/copyright)
 
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/blas)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindBLAS.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/blas)
+
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
diff --git a/ports/openblas/vcpkg-cmake-wrapper.cmake b/ports/openblas/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..fc074f33c
--- /dev/null
+++ b/ports/openblas/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,2 @@
+message(STATUS "Using VCPKG FindBLAS. Remove if CMake has been updated to account for Threads in OpenBLAS!")
+include(${CMAKE_CURRENT_LIST_DIR}/FindBLAS.cmake)