Skip to content

Commit 58074c7

Browse files
committed
Fix typos
1 parent 9de0589 commit 58074c7

File tree

3 files changed

+15
-30
lines changed

3 files changed

+15
-30
lines changed

.github/workflows/CI.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
with:
6060
compiler: ${{ matrix.toolchain.compiler }}
6161
version: ${{ matrix.toolchain.version }}
62-
62+
6363
# Build and test with built-in BLAS and LAPACK
6464
- name: Configure with CMake
6565
if: ${{ contains(matrix.build, 'cmake') }}
@@ -138,22 +138,22 @@ jobs:
138138
-DCMAKE_MAXIMUM_RANK:String=4
139139
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
140140
-DFIND_BLAS:STRING=TRUE
141-
-S . -B build_mkl
141+
-S . -B ${{ env.BUILD_DIR }}
142142
143143
- name: Build and compile with MKL
144-
run: cmake --build build_mkl --parallel
144+
run: cmake --build ${{ env.BUILD_DIR }} --parallel
145145

146146
- name: catch build fail with MKL
147147
if: failure()
148-
run: cmake --build build_mkl --verbose --parallel 1
148+
run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
149149

150150
- name: test with MKL
151151
run: >-
152152
ctest
153-
--test-dir build_mkl
153+
--test-dir ${{ env.BUILD_DIR }}
154154
--parallel
155155
--output-on-failure
156156
--no-tests=error
157157
158158
- name: Install project with MKL
159-
run: cmake --install build_mkl
159+
run: cmake --install ${{ env.BUILD_DIR }}

.github/workflows/ci_windows.yml

+8-23
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,6 @@ jobs:
121121
mingw-w64-${{ matrix.arch }}-ninja
122122
mingw-w64-${{ matrix.arch }}-openblas
123123
124-
- name: Setup msys POSIX environment
125-
uses: msys2/setup-msys2@v2
126-
if: contains(matrix.msystem, 'MSYS')
127-
with:
128-
msystem: MSYS
129-
update: false
130-
install: >-
131-
git
132-
mingw-w64-x86_64-gcc
133-
mingw-w64-x86_64-gcc-fortran
134-
python
135-
python-pip
136-
cmake
137-
ninja
138-
139124
- name: Install fypp
140125
run: pip install fypp
141126

@@ -144,7 +129,7 @@ jobs:
144129
run: >-
145130
PATH=$PATH:/mingw64/bin/ cmake
146131
-Wdev
147-
-B build_openblas
132+
-B build
148133
-DCMAKE_BUILD_TYPE=Debug
149134
-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
150135
-DCMAKE_MAXIMUM_RANK:String=4
@@ -154,22 +139,22 @@ jobs:
154139
FC: gfortran
155140
CC: gcc
156141
CXX: g++
157-
142+
158143
- name: CMake build with OpenBLAS
159-
run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --parallel
144+
run: PATH=$PATH:/mingw64/bin/ cmake --build build --parallel
160145

161146
- name: catch build fail
162147
if: failure()
163-
run: PATH=$PATH:/mingw64/bin/ cmake --build build_openblas --verbose --parallel 1
148+
run: PATH=$PATH:/mingw64/bin/ cmake --build build --verbose --parallel 1
164149

165150
- name: CTest with OpenBLAS
166-
run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build_openblas --output-on-failure --parallel -V -LE quadruple_precision
167-
151+
run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build --output-on-failure --parallel -V -LE quadruple_precision
152+
168153
- uses: actions/upload-artifact@v1
169154
if: failure()
170155
with:
171156
name: WindowsCMakeTestlog_openblas
172-
path: build_openblas/Testing/Temporary/LastTest.log
157+
path: build/Testing/Temporary/LastTest.log
173158

174159
- name: Install project with OpenBLAS
175-
run: PATH=$PATH:/mingw64/bin/ cmake --install build_openblas
160+
run: PATH=$PATH:/mingw64/bin/ cmake --install build

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Important options are
135135
- `-DBUILD_TESTING` set to `off` in case you want to disable the stdlib tests (default: `on`).
136136
- `-DCMAKE_VERBOSE_MAKEFILE` is by default set to `Off`, but if set to `On` will show commands used to compile the code.
137137
- `-DCMAKE_BUILD_TYPE` is by default set to `RelWithDebInfo`, which uses compiler flags suitable for code development (but with only `-O2` optimization). Beware the compiler flags set this way will override any compiler flags specified via `FFLAGS`. To prevent this, use `-DCMAKE_BUILD_TYPE=NoConfig` in conjunction with `FFLAGS`.
138-
- `-DFIND_BLAS` set to `off` in case you want to disable finding the extlib BLAS/LAPACK dependency (default: `on`).
138+
- `-DFIND_BLAS` set to `off` in case you want to disable finding the external BLAS/LAPACK dependency (default: `on`).
139139

140140
For example, to configure a build using the Ninja backend while specifying compiler optimization via `FFLAGS`, generating procedures up to rank 7, installing to your home directory, using the `NoConfig` compiler flags, and printing the compiler commands, use
141141

0 commit comments

Comments
 (0)