Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UMFPACK: Avoid non-POSIX flags for diff in make demos target #511

Merged
merged 1 commit into from
Nov 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions UMFPACK/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ all: library
demos: library
( cd build && cmake $(CMAKE_OPTIONS) -DDEMO=1 .. && cmake --build . --config Release -j${JOBS} )
( cd build && ./umfpack_simple )
- ( cd build && ./umfpack_di_demo > umfpack_di_demo.out && diff --strip-trailing-cr ../Demo/umfpack_di_demo.out umfpack_di_demo.out )
- ( cd build && ./umfpack_dl_demo > umfpack_dl_demo.out && diff --strip-trailing-cr ../Demo/umfpack_dl_demo.out umfpack_dl_demo.out )
- ( cd build && ./umfpack_zi_demo > umfpack_zi_demo.out && diff --strip-trailing-cr ../Demo/umfpack_zi_demo.out umfpack_zi_demo.out )
- ( cd build && ./umfpack_zl_demo > umfpack_zl_demo.out && diff --strip-trailing-cr ../Demo/umfpack_zl_demo.out umfpack_zl_demo.out )
- ( cd build && ./umfpack_di_demo > umfpack_di_demo.out && ( command -v d2u && d2u umfpack_di_demo.out || true ) && diff -u umfpack_di_demo.out ../Demo/umfpack_di_demo.out )
- ( cd build && ./umfpack_dl_demo > umfpack_dl_demo.out && ( command -v d2u && d2u umfpack_dl_demo.out || true ) && diff -u umfpack_dl_demo.out ../Demo/umfpack_dl_demo.out )
- ( cd build && ./umfpack_zi_demo > umfpack_zi_demo.out && ( command -v d2u && d2u umfpack_zi_demo.out || true ) && diff -u umfpack_zi_demo.out ../Demo/umfpack_zi_demo.out )
- ( cd build && ./umfpack_zl_demo > umfpack_zl_demo.out && ( command -v d2u && d2u umfpack_zl_demo.out || true ) && diff -u umfpack_zl_demo.out ../Demo/umfpack_zl_demo.out )

# demos requiring a Fortran compiler
fdemos: demos
Expand All @@ -82,14 +82,14 @@ fdemos: demos
( cd build && ./readhb_nozeros < ../Demo/HB/arc130.rua > tmp_A )
( cd build && ./readhb_size < ../Demo/HB/arc130.rua > tmp_Asize )
( cd build && ./umf4 a 1e-6 )
( cd build && ./umf4hb < ../Demo/HB/west0067.rua > umf4hb.out )
- diff --strip-trailing-cr ./Demo/umf4hb.out ./build/umf4hb.out
( cd build && ./umf4hb64 < ../Demo/HB/west0067.rua > umf4hb64.out )
- diff --strip-trailing-cr ./Demo/umf4hb64.out ./build/umf4hb64.out
( cd build && ./umf4zhb < ../Demo/HB/qc324.cua > umf4zhb.out )
- diff --strip-trailing-cr ./Demo/umf4zhb.out ./build/umf4zhb.out
( cd build && ./umf4zhb64 < ../Demo/HB/qc324.cua > umf4zhb64.out )
- diff --strip-trailing-cr ./Demo/umf4zhb64.out ./build/umf4zhb64.out
( cd build && ./umf4hb < ../Demo/HB/west0067.rua > umf4hb.out && ( command -v d2u && d2u umf4hb.out || true ) )
- diff -u ./build/umf4hb.out ./Demo/umf4hb.out
( cd build && ./umf4hb64 < ../Demo/HB/west0067.rua > umf4hb64.out && ( command -v d2u && d2u umf4hb64.out || true ) )
- diff -u ./build/umf4hb64.out ./Demo/umf4hb64.out
( cd build && ./umf4zhb < ../Demo/HB/qc324.cua > umf4zhb.out && ( command -v d2u && d2u umf4zhb.out || true ) )
- diff -u ./build/umf4zhb.out ./Demo/umf4zhb.out
( cd build && ./umf4zhb64 < ../Demo/HB/qc324.cua > umf4zhb64.out && ( command -v d2u && d2u umf4zhb64.out || true ) )
- diff -u ./build/umf4zhb64.out ./Demo/umf4zhb64.out

cov:
( cd Tcov && $(MAKE) )
Expand Down