From d6f3a36e45825e21f637020681a4509c076b4774 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 4 Nov 2017 02:35:37 -0500 Subject: [PATCH 01/21] Fixes for flang --- appveyor.yml | 20 ++++++++++++++------ cmake/f_check.cmake | 7 ------- cmake/lapacke.cmake | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1c0474d2d..8e584c68f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,23 +24,31 @@ skip_commits: message: /\[av skip\]/ environment: + global: + CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 matrix: + #- COMPILER: clang-cl + # DYNAMIC_ARCH: ON + # WITH_FORTRAN: no - COMPILER: clang-cl - DYNAMIC_ARCH: ON - - COMPILER: clang-cl - - COMPILER: cl + WITH_FORTRAN: yes + #- COMPILER: cl install: - - if [%COMPILER%]==[clang-cl] call C:\Miniconda36-x64\Scripts\activate.bat + - if [%COMPILER%]==[clang-cl] call %CONDA_INSTALL_LOCN%\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] conda config --add channels isuruf/label/flang --force + - if [%COMPILER%]==[clang-cl] conda install --yes flangdev clangdev ninja cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + - if [%COMPILER%]==[clang-cl] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%" + - if [%COMPILER%]==[clang-cl] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%" 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 [%WITH_FORTRAN%]==[no] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl . + - if [%WITH_FORTRAN%]==[yes] cmake -G "NMake Makefiles" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DBUILD_WITHOUT_LAPACK=no -DNOFORTRAN=0 . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . build_script: diff --git a/cmake/f_check.cmake b/cmake/f_check.cmake index 4848553d9..99e848748 100644 --- a/cmake/f_check.cmake +++ b/cmake/f_check.cmake @@ -20,12 +20,6 @@ # NEEDBUNDERSCORE # NEED2UNDERSCORES -if (MSVC) - # had to do this for MSVC, else CMake automatically assumes I have ifort... -hpa - include(CMakeForceCompiler) - CMAKE_FORCE_Fortran_COMPILER(gfortran GNU) -endif () - if (NOT NO_LAPACK) enable_language(Fortran) else() @@ -38,7 +32,6 @@ if (NOT ONLY_CBLAS) # TODO: detect whether underscore needed, set #defines and BU appropriately - use try_compile # TODO: set FEXTRALIB flags a la f_check? - set(BU "_") file(APPEND ${TARGET_CONF_TEMP} "#define BUNDERSCORE _\n" diff --git a/cmake/lapacke.cmake b/cmake/lapacke.cmake index fd5aee134..21caf9204 100644 --- a/cmake/lapacke.cmake +++ b/cmake/lapacke.cmake @@ -1,5 +1,5 @@ -set(C_SRC +set(CSRC lapacke_cbbcsd.c lapacke_cbbcsd_work.c lapacke_cbdsqr.c From e7e43c14177844b0c75e5345bb9bd137feceb404 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 4 Nov 2017 19:25:21 -0500 Subject: [PATCH 02/21] Add missing files in lapacke See https://github.com/Reference-LAPACK/lapack/pull/194 --- cmake/lapacke.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/lapacke.cmake b/cmake/lapacke.cmake index 21caf9204..a80987760 100644 --- a/cmake/lapacke.cmake +++ b/cmake/lapacke.cmake @@ -1839,6 +1839,12 @@ set(ZSRC lapacke_zhbevd_work.c lapacke_zhbevx.c lapacke_zhbevx_work.c + lapacke_zhbev_2stage.c + lapacke_zhbev_2stage_work.c + lapacke_zhbevd_2stage.c + lapacke_zhbevd_2stage_work.c + lapacke_zhbevx_2stage.c + lapacke_zhbevx_2stage_work.c lapacke_zhbgst.c lapacke_zhbgst_work.c lapacke_zhbgv.c From 517d02ef920b30b67b6df64a26d8795a4f4b467a Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 5 Nov 2017 01:01:38 -0600 Subject: [PATCH 03/21] Don't export MATGEN symbols --- exports/gensymbol | 56 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/exports/gensymbol b/exports/gensymbol index 89c6e8320..6a8399aaf 100644 --- a/exports/gensymbol +++ b/exports/gensymbol @@ -3053,34 +3053,34 @@ ## @(MATGEN_OBJ) from `lapack-3.4.1/lapacke/src/Makefile` ## Not exported: requires LAPACKE_TESTING to be set and depends on libtmg ## (see `lapack-3.4.1/TESTING/MATGEN`). - LAPACKE_clatms, - LAPACKE_clatms_work, - LAPACKE_dlatms, - LAPACKE_dlatms_work, - LAPACKE_slatms, - LAPACKE_slatms_work, - LAPACKE_zlatms, - LAPACKE_zlatms_work, - LAPACKE_clagge, - LAPACKE_clagge_work, - LAPACKE_dlagge, - LAPACKE_dlagge_work, - LAPACKE_slagge, - LAPACKE_slagge_work, - LAPACKE_zlagge, - LAPACKE_zlagge_work, - LAPACKE_claghe, - LAPACKE_claghe_work, - LAPACKE_zlaghe, - LAPACKE_zlaghe_work, - LAPACKE_clagsy, - LAPACKE_clagsy_work, - LAPACKE_dlagsy, - LAPACKE_dlagsy_work, - LAPACKE_slagsy, - LAPACKE_slagsy_work, - LAPACKE_zlagsy, - LAPACKE_zlagsy_work, + #LAPACKE_clatms, + #LAPACKE_clatms_work, + #LAPACKE_dlatms, + #LAPACKE_dlatms_work, + #LAPACKE_slatms, + #LAPACKE_slatms_work, + #LAPACKE_zlatms, + #LAPACKE_zlatms_work, + #LAPACKE_clagge, + #LAPACKE_clagge_work, + #LAPACKE_dlagge, + #LAPACKE_dlagge_work, + #LAPACKE_slagge, + #LAPACKE_slagge_work, + #LAPACKE_zlagge, + #LAPACKE_zlagge_work, + #LAPACKE_claghe, + #LAPACKE_claghe_work, + #LAPACKE_zlaghe, + #LAPACKE_zlaghe_work, + #LAPACKE_clagsy, + #LAPACKE_clagsy_work, + #LAPACKE_dlagsy, + #LAPACKE_dlagsy_work, + #LAPACKE_slagsy, + #LAPACKE_slagsy_work, + #LAPACKE_zlagsy, + #LAPACKE_zlagsy_work, ## new function from lapack-3.6.0 LAPACKE_cgejsv, From ed9e3aed8cdcd21f130eb7beffa4e2f47551ed12 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 5 Nov 2017 01:45:54 -0600 Subject: [PATCH 04/21] Add missing files in lapack.cmake --- cmake/lapack.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index e6cd5373d..1570a2868 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -132,7 +132,9 @@ set(CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f cgehd2.f cgehrd.f cgelq2.f cgelqf.f cgels.f cgelsd.f cgelss.f DEPRECATED/cgelsx.f cgelsy.f cgeql2.f cgeqlf.f cgeqp3.f DEPRECATED/cgeqpf.f cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f - cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f + cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f cgejsv.f cgesvdx.f cgesvj.f + cgetrf2.f cgges3.f cggev3.f cgghd3.f cggsvd3.f cggsvp3.f cpotrf2.f csysv_aa.f + csytrs_aa.f cgesvx.f cgetc2.f cgetri.f cggbak.f cggbal.f cgges.f cggesx.f cggev.f cggevx.f cggglm.f cgghrd.f cgglse.f cggqrf.f cggrqf.f From 4bff792c90dcbefc9799d1b3da11f5c9b4f1df25 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 5 Nov 2017 11:41:10 -0600 Subject: [PATCH 05/21] [lapack] add sources --- cmake/lapack.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 1570a2868..5bacd1032 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -134,7 +134,7 @@ set(CLASRC DEPRECATED/cgeqpf.f cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f cgejsv.f cgesvdx.f cgesvj.f cgetrf2.f cgges3.f cggev3.f cgghd3.f cggsvd3.f cggsvp3.f cpotrf2.f csysv_aa.f - csytrs_aa.f + csytrs_aa.f cgsvj0.f cgsvj1.f cunm22.f cgesvx.f cgetc2.f cgetri.f cggbak.f cggbal.f cgges.f cggesx.f cggev.f cggevx.f cggglm.f cgghrd.f cgglse.f cggqrf.f cggrqf.f From a8815264223f7d7776dc16f684901c316eaa94f0 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 5 Nov 2017 12:16:07 -0600 Subject: [PATCH 06/21] [lapack] add sources --- cmake/lapack.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 5bacd1032..98c6524fa 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -134,7 +134,7 @@ set(CLASRC DEPRECATED/cgeqpf.f cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f cgejsv.f cgesvdx.f cgesvj.f cgetrf2.f cgges3.f cggev3.f cgghd3.f cggsvd3.f cggsvp3.f cpotrf2.f csysv_aa.f - csytrs_aa.f cgsvj0.f cgsvj1.f cunm22.f + csytrs_aa.f cgsvj0.f cgsvj1.f cunm22.f csytrf_aa.f cgesvx.f cgetc2.f cgetri.f cggbak.f cggbal.f cgges.f cggesx.f cggev.f cggevx.f cggglm.f cgghrd.f cgglse.f cggqrf.f cggrqf.f From e06446fe41076ef5aafec31267e9f6dd8023c05a Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 5 Nov 2017 12:50:23 -0600 Subject: [PATCH 07/21] [lapack] add sources --- cmake/lapack.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 98c6524fa..395f0006e 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -134,7 +134,7 @@ set(CLASRC DEPRECATED/cgeqpf.f cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f cgejsv.f cgesvdx.f cgesvj.f cgetrf2.f cgges3.f cggev3.f cgghd3.f cggsvd3.f cggsvp3.f cpotrf2.f csysv_aa.f - csytrs_aa.f cgsvj0.f cgsvj1.f cunm22.f csytrf_aa.f + csytrs_aa.f cgsvj0.f cgsvj1.f cunm22.f csytrf_aa.f clasyf_aa.f cgesvx.f cgetc2.f cgetri.f cggbak.f cggbal.f cgges.f cggesx.f cggev.f cggevx.f cggglm.f cgghrd.f cgglse.f cggqrf.f cggrqf.f From 3e0771dcc034c424ed8b91161f8f684a9d02e229 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 5 Nov 2017 13:28:23 -0600 Subject: [PATCH 08/21] [lapack] add sources --- cmake/lapack.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 395f0006e..1df600c12 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -361,7 +361,7 @@ set(ZLASRC zhetri_3x.f zhesv_rk.f zhb2st_kernels.f zhbev_2stage.f zhbevd_2stage.f zhbevx_2stage.f zheev_2stage.f zheevd_2stage.f zheevr_2stage.f zheevx_2stage.f zhegv_2stage.f zhetrd_2stage.f zhetrd_hb2st.F zhetrd_he2hb.f - zlarfy.f + zlarfy.f zpotrs.f ) set(LA_REL_SRC ${ALLAUX}) From b0afe107cd539d6e091bd99065f78f329a21a031 Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 5 Nov 2017 15:18:07 -0600 Subject: [PATCH 09/21] [cmake] export all symbols --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fdfb3ffa..0d2e30809 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,6 +160,8 @@ endif() # Set output for libopenblas set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES LIBRARY_OUTPUT_NAME_DEBUG "${OpenBLAS_LIBNAME}_d") +set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + foreach (OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES}) string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG ) From b9fec61892dda17953da614742ca9007a99551fe Mon Sep 17 00:00:00 2001 From: xoviat Date: Sun, 5 Nov 2017 18:21:29 -0600 Subject: [PATCH 10/21] [appveyor] uncomment matrix --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8e584c68f..2e88af796 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,12 +27,12 @@ environment: global: CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 matrix: - #- COMPILER: clang-cl - # DYNAMIC_ARCH: ON - # WITH_FORTRAN: no + - COMPILER: clang-cl + DYNAMIC_ARCH: ON + WITH_FORTRAN: no - COMPILER: clang-cl WITH_FORTRAN: yes - #- COMPILER: cl + - COMPILER: cl install: - if [%COMPILER%]==[clang-cl] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat From 192193fe23cdd9ccbbb9809da0439f0fc294f1b3 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 5 Nov 2017 18:23:48 -0600 Subject: [PATCH 11/21] Install flang in appveyor only when needed --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2e88af796..b4c1fe539 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,8 +37,9 @@ environment: install: - if [%COMPILER%]==[clang-cl] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force - - if [%COMPILER%]==[clang-cl] conda config --add channels isuruf/label/flang --force - - if [%COMPILER%]==[clang-cl] conda install --yes flangdev clangdev ninja cmake + - if [%WITH_FORTRAN%]==[yes] conda config --add channels isuruf/label/flang --force + - if [%COMPILER%]==[clang-cl] conda install --yes --quiet clangdev ninja cmake + - if [%WITH_FORTRAN%]==[yes] conda install --yes --quiet flangdev clangdev cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - if [%COMPILER%]==[clang-cl] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%" - if [%COMPILER%]==[clang-cl] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%" From 060ce155a9b6d61575e201bc99e1932dcc994dd5 Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 6 Nov 2017 08:55:41 -0600 Subject: [PATCH 12/21] [lapack] reduce diff --- cmake/lapack.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 1df600c12..4dbaf96c2 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -132,9 +132,7 @@ set(CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f cgehd2.f cgehrd.f cgelq2.f cgelqf.f cgels.f cgelsd.f cgelss.f DEPRECATED/cgelsx.f cgelsy.f cgeql2.f cgeqlf.f cgeqp3.f DEPRECATED/cgeqpf.f cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f - cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f cgejsv.f cgesvdx.f cgesvj.f - cgetrf2.f cgges3.f cggev3.f cgghd3.f cggsvd3.f cggsvp3.f cpotrf2.f csysv_aa.f - csytrs_aa.f cgsvj0.f cgsvj1.f cunm22.f csytrf_aa.f clasyf_aa.f + cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f cgesvx.f cgetc2.f cgetri.f cggbak.f cggbal.f cgges.f cggesx.f cggev.f cggevx.f cggglm.f cgghrd.f cgglse.f cggqrf.f cggrqf.f From d6d79cbc373f29464a876c07b2585149ddd71a9b Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 6 Nov 2017 08:56:10 -0600 Subject: [PATCH 13/21] [lapack] reduce diff --- cmake/lapack.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 4dbaf96c2..e6cd5373d 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -359,7 +359,7 @@ set(ZLASRC zhetri_3x.f zhesv_rk.f zhb2st_kernels.f zhbev_2stage.f zhbevd_2stage.f zhbevx_2stage.f zheev_2stage.f zheevd_2stage.f zheevr_2stage.f zheevx_2stage.f zhegv_2stage.f zhetrd_2stage.f zhetrd_hb2st.F zhetrd_he2hb.f - zlarfy.f zpotrs.f + zlarfy.f ) set(LA_REL_SRC ${ALLAUX}) From a93df47126901d500944b7bfd5efa4d57da2a2c0 Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 6 Nov 2017 08:57:00 -0600 Subject: [PATCH 14/21] [cmake] cleanup --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d2e30809..2bc3a210c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,14 +152,13 @@ if(MSVC AND BUILD_SHARED_LIBS) if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 3.4) include("${PROJECT_SOURCE_DIR}/cmake/export.cmake") else() - # Creates verbose .def file (51KB vs 18KB) - set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true) endif() endif() # Set output for libopenblas set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES LIBRARY_OUTPUT_NAME_DEBUG "${OpenBLAS_LIBNAME}_d") +# Creates verbose .def file (51KB vs 18KB) set_target_properties( ${OpenBLAS_LIBNAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) From 06b97a1b20a44685499db24d44634ffd19e01579 Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 6 Nov 2017 10:25:49 -0600 Subject: [PATCH 15/21] [lapack] revert changes --- cmake/lapack.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index e6cd5373d..395f0006e 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -132,7 +132,9 @@ set(CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f cgehd2.f cgehrd.f cgelq2.f cgelqf.f cgels.f cgelsd.f cgelss.f DEPRECATED/cgelsx.f cgelsy.f cgeql2.f cgeqlf.f cgeqp3.f DEPRECATED/cgeqpf.f cgeqr2.f cgeqr2p.f cgeqrf.f cgeqrfp.f cgerfs.f - cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f + cgerq2.f cgerqf.f cgesc2.f cgesdd.f cgesvd.f cgejsv.f cgesvdx.f cgesvj.f + cgetrf2.f cgges3.f cggev3.f cgghd3.f cggsvd3.f cggsvp3.f cpotrf2.f csysv_aa.f + csytrs_aa.f cgsvj0.f cgsvj1.f cunm22.f csytrf_aa.f clasyf_aa.f cgesvx.f cgetc2.f cgetri.f cggbak.f cggbal.f cgges.f cggesx.f cggev.f cggevx.f cggglm.f cgghrd.f cgglse.f cggqrf.f cggrqf.f From c8be598ec31444ec023d55ae70f0611278ec935e Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 6 Nov 2017 10:27:58 -0600 Subject: [PATCH 16/21] [gensymbol] revert changes --- exports/gensymbol | 56 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/exports/gensymbol b/exports/gensymbol index 6a8399aaf..89c6e8320 100644 --- a/exports/gensymbol +++ b/exports/gensymbol @@ -3053,34 +3053,34 @@ ## @(MATGEN_OBJ) from `lapack-3.4.1/lapacke/src/Makefile` ## Not exported: requires LAPACKE_TESTING to be set and depends on libtmg ## (see `lapack-3.4.1/TESTING/MATGEN`). - #LAPACKE_clatms, - #LAPACKE_clatms_work, - #LAPACKE_dlatms, - #LAPACKE_dlatms_work, - #LAPACKE_slatms, - #LAPACKE_slatms_work, - #LAPACKE_zlatms, - #LAPACKE_zlatms_work, - #LAPACKE_clagge, - #LAPACKE_clagge_work, - #LAPACKE_dlagge, - #LAPACKE_dlagge_work, - #LAPACKE_slagge, - #LAPACKE_slagge_work, - #LAPACKE_zlagge, - #LAPACKE_zlagge_work, - #LAPACKE_claghe, - #LAPACKE_claghe_work, - #LAPACKE_zlaghe, - #LAPACKE_zlaghe_work, - #LAPACKE_clagsy, - #LAPACKE_clagsy_work, - #LAPACKE_dlagsy, - #LAPACKE_dlagsy_work, - #LAPACKE_slagsy, - #LAPACKE_slagsy_work, - #LAPACKE_zlagsy, - #LAPACKE_zlagsy_work, + LAPACKE_clatms, + LAPACKE_clatms_work, + LAPACKE_dlatms, + LAPACKE_dlatms_work, + LAPACKE_slatms, + LAPACKE_slatms_work, + LAPACKE_zlatms, + LAPACKE_zlatms_work, + LAPACKE_clagge, + LAPACKE_clagge_work, + LAPACKE_dlagge, + LAPACKE_dlagge_work, + LAPACKE_slagge, + LAPACKE_slagge_work, + LAPACKE_zlagge, + LAPACKE_zlagge_work, + LAPACKE_claghe, + LAPACKE_claghe_work, + LAPACKE_zlaghe, + LAPACKE_zlaghe_work, + LAPACKE_clagsy, + LAPACKE_clagsy_work, + LAPACKE_dlagsy, + LAPACKE_dlagsy_work, + LAPACKE_slagsy, + LAPACKE_slagsy_work, + LAPACKE_zlagsy, + LAPACKE_zlagsy_work, ## new function from lapack-3.6.0 LAPACKE_cgejsv, From 914a57145ddc074def9325658cbddb535db777eb Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 6 Nov 2017 10:28:33 -0600 Subject: [PATCH 17/21] [appeyor] switch order --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b4c1fe539..4eaae5eed 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,11 +27,11 @@ environment: global: CONDA_INSTALL_LOCN: C:\\Miniconda36-x64 matrix: + - COMPILER: clang-cl + WITH_FORTRAN: yes - COMPILER: clang-cl DYNAMIC_ARCH: ON WITH_FORTRAN: no - - COMPILER: clang-cl - WITH_FORTRAN: yes - COMPILER: cl install: From 91492e353555c322e29e9aa2771e52162dd47d4d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 5 Nov 2017 18:41:31 -0600 Subject: [PATCH 18/21] Restore matgen --- cmake/lapack.cmake | 28 ++++++++++++++++++++++++---- cmake/lapacke.cmake | 2 +- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 395f0006e..9ac08cffa 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -364,21 +364,41 @@ set(ZLASRC zlarfy.f ) +set(SCATGEN slatm1.f slaran.f slarnd.f) + +set(SMATGEN slatms.f slatme.f slatmr.f slatmt.f + slagge.f slagsy.f slakf2.f slarge.f slaror.f slarot.f slatm2.f + slatm3.f slatm5.f slatm6.f slatm7.f slahilb.f) + +set(CMATGEN clatms.f clatme.f clatmr.f clatmt.f + clagge.f claghe.f clagsy.f clakf2.f clarge.f claror.f clarot.f + clatm1.f clarnd.f clatm2.f clatm3.f clatm5.f clatm6.f clahilb.f slatm7.f) + +set(DZATGEN dlatm1.f dlaran.f dlarnd.f) + +set(DMATGEN dlatms.f dlatme.f dlatmr.f dlatmt.f + dlagge.f dlagsy.f dlakf2.f dlarge.f dlaror.f dlarot.f dlatm2.f + dlatm3.f dlatm5.f dlatm6.f dlatm7.f dlahilb.f) + +set(ZMATGEN zlatms.f zlatme.f zlatmr.f zlatmt.f + zlagge.f zlaghe.f zlagsy.f zlakf2.f zlarge.f zlaror.f zlarot.f + zlatm1.f zlarnd.f zlatm2.f zlatm3.f zlatm5.f zlatm6.f zlahilb.f dlatm7.f) + set(LA_REL_SRC ${ALLAUX}) if (BUILD_SINGLE) - list(APPEND LA_REL_SRC ${SLASRC} ${DSLASRC} ${SCLAUX}) + list(APPEND LA_REL_SRC ${SLASRC} ${DSLASRC} ${SCLAUX} ${SCATGEN} ${SMATGEN}) endif () if (BUILD_DOUBLE) - list(APPEND LA_REL_SRC ${DLASRC} ${DSLASRC} ${DZLAUX}) + list(APPEND LA_REL_SRC ${DLASRC} ${DSLASRC} ${DZLAUX} ${DMATGEN} ${DZATGEN}) endif () if (BUILD_COMPLEX) - list(APPEND LA_REL_SRC ${CLASRC} ${ZCLASRC} ${SCLAUX}) + list(APPEND LA_REL_SRC ${CLASRC} ${ZCLASRC} ${SCLAUX} ${CMATGEN} ${SCATGEN}) endif () if (BUILD_COMPLEX16) - list(APPEND LA_REL_SRC ${ZLASRC} ${ZCLASRC} ${DZLAUX}) + list(APPEND LA_REL_SRC ${ZLASRC} ${ZCLASRC} ${DZLAUX} ${ZMATGEN} ${DZATGEN}) endif () # add lapack-netlib folder to the sources diff --git a/cmake/lapacke.cmake b/cmake/lapacke.cmake index a80987760..17dbe7241 100644 --- a/cmake/lapacke.cmake +++ b/cmake/lapacke.cmake @@ -2387,7 +2387,7 @@ if (BUILD_COMPLEX16) endif () # add lapack-netlib folder to the sources -set(LAPACKE_SOURCES "") +set(LAPACKE_SOURCES "${MATGEN}") foreach (LAE_FILE ${LAPACKE_REL_SRC}) list(APPEND LAPACKE_SOURCES "${NETLIB_LAPACK_DIR}/LAPACKE/src/${LAE_FILE}") endforeach () From 13c18bd96c0b9b8495151ddbfff4714a33720fc0 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 5 Nov 2017 18:50:15 -0600 Subject: [PATCH 19/21] Fix MATGEN src location --- cmake/lapack.cmake | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 9ac08cffa..6770d5ec4 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -386,24 +386,42 @@ set(ZMATGEN zlatms.f zlatme.f zlatmr.f zlatmt.f set(LA_REL_SRC ${ALLAUX}) if (BUILD_SINGLE) - list(APPEND LA_REL_SRC ${SLASRC} ${DSLASRC} ${SCLAUX} ${SCATGEN} ${SMATGEN}) + list(APPEND LA_REL_SRC ${SLASRC} ${DSLASRC} ${SCLAUX}) endif () if (BUILD_DOUBLE) - list(APPEND LA_REL_SRC ${DLASRC} ${DSLASRC} ${DZLAUX} ${DMATGEN} ${DZATGEN}) + list(APPEND LA_REL_SRC ${DLASRC} ${DSLASRC} ${DZLAUX}) endif () if (BUILD_COMPLEX) - list(APPEND LA_REL_SRC ${CLASRC} ${ZCLASRC} ${SCLAUX} ${CMATGEN} ${SCATGEN}) + list(APPEND LA_REL_SRC ${CLASRC} ${ZCLASRC} ${SCLAUX}) endif () if (BUILD_COMPLEX16) - list(APPEND LA_REL_SRC ${ZLASRC} ${ZCLASRC} ${DZLAUX} ${ZMATGEN} ${DZATGEN}) + list(APPEND LA_REL_SRC ${ZLASRC} ${ZCLASRC} ${DZLAUX}) endif () +set(MATGEN_SRC "") +if(BUILD_SINGLE) + set(MATGEN_SRC ${SMATGEN} ${SCATGEN}) +endif() +if(BUILD_DOUBLE) + set(MATGEN_SRC ${ALLOBJ} ${DMATGEN} ${DZATGEN}) +endif() +if(BUILD_COMPLEX) + set(MATGEN_SRC ${ALLOBJ} ${CMATGEN} ${SCATGEN}) +endif() +if(BUILD_COMPLEX16) + set(MATGEN_SRC ${ALLOBJ} ${ZMATGEN} ${DZATGEN}) +endif() + + # add lapack-netlib folder to the sources set(LA_SOURCES "") foreach (LA_FILE ${LA_REL_SRC}) list(APPEND LA_SOURCES "${NETLIB_LAPACK_DIR}/SRC/${LA_FILE}") endforeach () +foreach (LA_FILE ${MATGEN_SRC}) + list(APPEND LA_SOURCES "${NETLIB_LAPACK_DIR}/TESTING/MATGEN/${LA_FILE}") +endforeach () set_source_files_properties(${LA_SOURCES} PROPERTIES COMPILE_FLAGS "${LAPACK_FFLAGS}") From 7cbd054b48d492bd7ed15197bcb6f0f3b6eed125 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 5 Nov 2017 18:54:55 -0600 Subject: [PATCH 20/21] Fix MATGEN location --- cmake/lapacke.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/lapacke.cmake b/cmake/lapacke.cmake index 17dbe7241..841dc4540 100644 --- a/cmake/lapacke.cmake +++ b/cmake/lapacke.cmake @@ -2369,7 +2369,7 @@ lapacke_dpb_nancheck.c lapacke_sst_nancheck.c lapacke_dpb_trans.c lapacke_ssy_nancheck.c ) -set(LAPACKE_REL_SRC "") +set(LAPACKE_REL_SRC "${MATGEN}") if (BUILD_SINGLE) list(APPEND LAPACKE_REL_SRC ${SSRC}) endif () @@ -2387,7 +2387,7 @@ if (BUILD_COMPLEX16) endif () # add lapack-netlib folder to the sources -set(LAPACKE_SOURCES "${MATGEN}") +set(LAPACKE_SOURCES "") foreach (LAE_FILE ${LAPACKE_REL_SRC}) list(APPEND LAPACKE_SOURCES "${NETLIB_LAPACK_DIR}/LAPACKE/src/${LAE_FILE}") endforeach () From 5cfd56134ec6149db1e60dbab8e4f7bc23cbbcbb Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 6 Nov 2017 12:28:52 -0600 Subject: [PATCH 21/21] Append instead of setting MATGEN_SRC --- cmake/lapack.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake index 6770d5ec4..0f8af52f3 100644 --- a/cmake/lapack.cmake +++ b/cmake/lapack.cmake @@ -403,16 +403,16 @@ endif () set(MATGEN_SRC "") if(BUILD_SINGLE) - set(MATGEN_SRC ${SMATGEN} ${SCATGEN}) + list(APPEND MATGEN_SRC ${SMATGEN} ${SCATGEN}) endif() if(BUILD_DOUBLE) - set(MATGEN_SRC ${ALLOBJ} ${DMATGEN} ${DZATGEN}) + list(APPEND MATGEN_SRC ${ALLOBJ} ${DMATGEN} ${DZATGEN}) endif() if(BUILD_COMPLEX) - set(MATGEN_SRC ${ALLOBJ} ${CMATGEN} ${SCATGEN}) + list(APPEND MATGEN_SRC ${ALLOBJ} ${CMATGEN} ${SCATGEN}) endif() if(BUILD_COMPLEX16) - set(MATGEN_SRC ${ALLOBJ} ${ZMATGEN} ${DZATGEN}) + list(APPEND MATGEN_SRC ${ALLOBJ} ${ZMATGEN} ${DZATGEN}) endif()