floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for flang

This commit is contained in:
Isuru Fernando 2017-11-04 02:35:37 -05:00
parent ab87ee6b48
commit d6f3a36e45
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
appveyor.yml
View File

@ -24,23 +24,31 @@ skip_commits:
message: /\[av skip\]/ message: /\[av skip\]/
environment: environment:
global:
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
matrix: matrix:
#- COMPILER: clang-cl
# DYNAMIC_ARCH: ON
# WITH_FORTRAN: no
- COMPILER: clang-cl - COMPILER: clang-cl
DYNAMIC_ARCH: ON WITH_FORTRAN: yes
- COMPILER: clang-cl #- COMPILER: cl
- COMPILER: cl
install: 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 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] 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: before_build:
- echo Running cmake... - echo Running cmake...
- cd c:\projects\OpenBLAS - cd c:\projects\OpenBLAS
- if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" . - 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 . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON .
build_script: build_script:

7
cmake/f_check.cmake
View File

@ -20,12 +20,6 @@
# NEEDBUNDERSCORE # NEEDBUNDERSCORE
# NEED2UNDERSCORES # 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) if (NOT NO_LAPACK)
enable_language(Fortran) enable_language(Fortran)
else() else()
@ -38,7 +32,6 @@ if (NOT ONLY_CBLAS)
# TODO: detect whether underscore needed, set #defines and BU appropriately - use try_compile # TODO: detect whether underscore needed, set #defines and BU appropriately - use try_compile
# TODO: set FEXTRALIB flags a la f_check? # TODO: set FEXTRALIB flags a la f_check?
set(BU "_") set(BU "_")
file(APPEND ${TARGET_CONF_TEMP} file(APPEND ${TARGET_CONF_TEMP}
"#define BUNDERSCORE _\n" "#define BUNDERSCORE _\n"

2
cmake/lapacke.cmake
View File

@ -1,5 +1,5 @@
set(C_SRC set(CSRC
lapacke_cbbcsd.c lapacke_cbbcsd.c
lapacke_cbbcsd_work.c lapacke_cbbcsd_work.c
lapacke_cbdsqr.c lapacke_cbdsqr.c