From 5b5bd87ee3d42677f90f5de19151929d644a05e1 Mon Sep 17 00:00:00 2001 From: xoviat Date: Thu, 2 Nov 2017 12:50:45 -0500 Subject: [PATCH 01/13] [appveyor] add flang --- appveyor.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1c0474d2d..aa4df99f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,22 +25,28 @@ skip_commits: environment: matrix: + - COMPILER: flang + - COMPILER: cl + - COMPILER: clang-cl - COMPILER: clang-cl DYNAMIC_ARCH: ON - - COMPILER: clang-cl - - COMPILER: cl install: - if [%COMPILER%]==[clang-cl] call C:\Miniconda36-x64\Scripts\activate.bat - if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force - if [%COMPILER%]==[clang-cl] conda install --yes clangdev ninja cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + + - if [%COMPILER%]==[flang] conda config --add channels conda-forge isuruf/label/flang --force + - if [%COMPILER%]==[flang] conda install --yes clangdev flangdev cmake + - if [%COMPILER%]==[flang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 before_build: - echo Running cmake... - cd c:\projects\OpenBLAS - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" . - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl . + - if [%COMPILER%]==[flang] cmake -G "NMake Makefiles" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DBUILD_WITHOUT_LAPACK=Off . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . build_script: From 29ea2568cfa5e68f8cc357556bdd13925e81bc98 Mon Sep 17 00:00:00 2001 From: xoviat Date: Thu, 2 Nov 2017 12:55:39 -0500 Subject: [PATCH 02/13] [appveyor] activate conda --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index aa4df99f8..50ca3d9a9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,6 +37,7 @@ install: - if [%COMPILER%]==[clang-cl] conda install --yes clangdev ninja cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + - if [%COMPILER%]==[flang] call C:\Miniconda36-x64\Scripts\activate.bat - if [%COMPILER%]==[flang] conda config --add channels conda-forge isuruf/label/flang --force - if [%COMPILER%]==[flang] conda install --yes clangdev flangdev cmake - if [%COMPILER%]==[flang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 From b498dada26aa6e31e3ee84e786047302c0c8cddb Mon Sep 17 00:00:00 2001 From: xoviat Date: Thu, 2 Nov 2017 12:58:22 -0500 Subject: [PATCH 03/13] [appveyor] fix conda --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 50ca3d9a9..4ea78eae6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,7 +38,8 @@ install: - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - if [%COMPILER%]==[flang] call C:\Miniconda36-x64\Scripts\activate.bat - - if [%COMPILER%]==[flang] conda config --add channels conda-forge isuruf/label/flang --force + - if [%COMPILER%]==[flang] conda config --add channels conda-forge --force + - if [%COMPILER%]==[flang] conda config --add channels isuruf/label/flang - if [%COMPILER%]==[flang] conda install --yes clangdev flangdev cmake - if [%COMPILER%]==[flang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 From 2ad344a046ecb4352856765182ffc20708290f59 Mon Sep 17 00:00:00 2001 From: xoviat Date: Thu, 2 Nov 2017 13:06:40 -0500 Subject: [PATCH 04/13] [cmake] remove force compiler --- cmake/f_check.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/f_check.cmake b/cmake/f_check.cmake index 4848553d9..e1820bb51 100644 --- a/cmake/f_check.cmake +++ b/cmake/f_check.cmake @@ -22,8 +22,8 @@ if (MSVC) # had to do this for MSVC, else CMake automatically assumes I have ifort... -hpa - include(CMakeForceCompiler) - CMAKE_FORCE_Fortran_COMPILER(gfortran GNU) + # include(CMakeForceCompiler) + # CMAKE_FORCE_Fortran_COMPILER(gfortran GNU) endif () if (NOT NO_LAPACK) From c0f50ced4818228163ae398ab00ca0fef71216fa Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 16:15:21 -0500 Subject: [PATCH 05/13] [f_check] add library directories --- cmake/f_check.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/f_check.cmake b/cmake/f_check.cmake index e1820bb51..fad4b2020 100644 --- a/cmake/f_check.cmake +++ b/cmake/f_check.cmake @@ -24,6 +24,9 @@ if (MSVC) # had to do this for MSVC, else CMake automatically assumes I have ifort... -hpa # include(CMakeForceCompiler) # CMAKE_FORCE_Fortran_COMPILER(gfortran GNU) + + link_directories("C:/Miniconda36-x64/Library") + link_directories("C:/Miniconda36-x64/Library/lib") endif () if (NOT NO_LAPACK) From de1695648ed4dd331651ab851575fe154928a388 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 16:19:58 -0500 Subject: [PATCH 06/13] [f_check] revert changes --- cmake/f_check.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmake/f_check.cmake b/cmake/f_check.cmake index fad4b2020..e1820bb51 100644 --- a/cmake/f_check.cmake +++ b/cmake/f_check.cmake @@ -24,9 +24,6 @@ if (MSVC) # had to do this for MSVC, else CMake automatically assumes I have ifort... -hpa # include(CMakeForceCompiler) # CMAKE_FORCE_Fortran_COMPILER(gfortran GNU) - - link_directories("C:/Miniconda36-x64/Library") - link_directories("C:/Miniconda36-x64/Library/lib") endif () if (NOT NO_LAPACK) From f12152b9ea443d49b4122e1c3ec0e2c6d3de190d Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 16:20:47 -0500 Subject: [PATCH 07/13] [cmake] add library directories --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fdfb3ffa..b5c3640d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,9 @@ set(OpenBLAS_MINOR_VERSION 3) set(OpenBLAS_PATCH_VERSION 0.dev) set(OpenBLAS_VERSION "${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.${OpenBLAS_PATCH_VERSION}") +link_directories("C:/Miniconda36-x64/Library") +link_directories("C:/Miniconda36-x64/Library/lib") + # Adhere to GNU filesystem layout conventions include(GNUInstallDirs) From 09c8fce89860ec6c77766b4993a85091182026a5 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 16:34:23 -0500 Subject: [PATCH 08/13] [appeyor] find ws2_32.lib --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 4ea78eae6..e41b4a448 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,6 +32,8 @@ environment: DYNAMIC_ARCH: ON install: + - ps: Get-ChildItem -Path C:\ -Filter ws2_32.lib -Recurse -ErrorAction SilentlyContinue -Force + - if [%COMPILER%]==[clang-cl] call C:\Miniconda36-x64\Scripts\activate.bat - if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force - if [%COMPILER%]==[clang-cl] conda install --yes clangdev ninja cmake From 51da07f676df489bb90ae5c34574b03b119dde8f Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 16:49:35 -0500 Subject: [PATCH 09/13] [appveyor] copy libs --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e41b4a448..e2bc47ee3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,13 +32,14 @@ environment: DYNAMIC_ARCH: ON install: - - ps: Get-ChildItem -Path C:\ -Filter ws2_32.lib -Recurse -ErrorAction SilentlyContinue -Force - - if [%COMPILER%]==[clang-cl] call C:\Miniconda36-x64\Scripts\activate.bat - if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force - if [%COMPILER%]==[clang-cl] conda install --yes clangdev ninja cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + - ps: cp C:\Miniconda36-x64\Library\lib\*.lib \C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64 + - ps: cp C:\Miniconda36-x64\Library\lib\*.lib C:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64 + - if [%COMPILER%]==[flang] call C:\Miniconda36-x64\Scripts\activate.bat - if [%COMPILER%]==[flang] conda config --add channels conda-forge --force - if [%COMPILER%]==[flang] conda config --add channels isuruf/label/flang From 9b981b9b7c66f8386963a5e7394d44a1885c19c1 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 16:55:35 -0500 Subject: [PATCH 10/13] [appveyor] fix --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e2bc47ee3..990d64196 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,8 +37,8 @@ install: - if [%COMPILER%]==[clang-cl] conda install --yes clangdev ninja cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - - ps: cp C:\Miniconda36-x64\Library\lib\*.lib \C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64 - - ps: cp C:\Miniconda36-x64\Library\lib\*.lib C:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64 + - ps: cp C:\Miniconda36-x64\Library\lib\*.lib "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64" + - ps: cp C:\Miniconda36-x64\Library\lib\*.lib "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64" - if [%COMPILER%]==[flang] call C:\Miniconda36-x64\Scripts\activate.bat - if [%COMPILER%]==[flang] conda config --add channels conda-forge --force From 6cc42a4caa23216e87a9edcf582d9f6fde9d96ba Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 17:02:03 -0500 Subject: [PATCH 11/13] [appveyor] move copy --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 990d64196..ee568aa62 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,14 +37,14 @@ install: - if [%COMPILER%]==[clang-cl] conda install --yes clangdev ninja cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - - ps: cp C:\Miniconda36-x64\Library\lib\*.lib "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64" - - ps: cp C:\Miniconda36-x64\Library\lib\*.lib "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64" - - if [%COMPILER%]==[flang] call C:\Miniconda36-x64\Scripts\activate.bat - if [%COMPILER%]==[flang] conda config --add channels conda-forge --force - if [%COMPILER%]==[flang] conda config --add channels isuruf/label/flang - if [%COMPILER%]==[flang] conda install --yes clangdev flangdev cmake - if [%COMPILER%]==[flang] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + + - ps: cp C:\Miniconda36-x64\Library\lib\*.lib "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64" + - ps: cp C:\Miniconda36-x64\Library\lib\*.lib "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.14393.0\um\x64" before_build: - echo Running cmake... From 2758d0cbb682902cbb9fa0efc543960ada89b989 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 17:50:35 -0500 Subject: [PATCH 12/13] [gensymbol] switch symbol --- exports/gensymbol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exports/gensymbol b/exports/gensymbol index 89c6e8320..d7b7073a8 100644 --- a/exports/gensymbol +++ b/exports/gensymbol @@ -1018,7 +1018,7 @@ lapack_make_complex_double, # @(SRC_OBJ) from `lapack-3.5.0/lapacke/src/Makefile` - LAPACKE_cbbcsd, + LAPACKE_cbbcsd_, LAPACKE_cbbcsd_work, LAPACKE_cbdsqr, LAPACKE_cbdsqr_work, From 214c299a2b5d6e2ef4d1a2fd1128577badfa85c6 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sat, 4 Nov 2017 18:25:45 -0500 Subject: [PATCH 13/13] [gensymbol] try first underscore --- exports/gensymbol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exports/gensymbol b/exports/gensymbol index d7b7073a8..2e31e89ce 100644 --- a/exports/gensymbol +++ b/exports/gensymbol @@ -1018,7 +1018,7 @@ lapack_make_complex_double, # @(SRC_OBJ) from `lapack-3.5.0/lapacke/src/Makefile` - LAPACKE_cbbcsd_, + _LAPACKE_cbbcsd_, LAPACKE_cbbcsd_work, LAPACKE_cbdsqr, LAPACKE_cbdsqr_work,