Skip to content

Avoid using complex number literal extension. #18

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 19, 2025
Merged

Avoid using complex number literal extension. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faf2b6e
Avoid using complex number literal extension, instead relying on
BenBrock Mar 19, 2025
0f591b4
Add matrix with complex numbers to CI.
BenBrock Mar 19, 2025
6f29c4c
Actually compile with Clang.
BenBrock Mar 19, 2025
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
28 changes: 21 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,33 @@ jobs:

gcc:
runs-on: 'ubuntu-latest'
strategy:
matrix:
cxx: [gcc, clang]
name: ${{ matrix.cxx }}
env:
CXX: ${{ matrix.cxx }}
CXX: g++-12
CC: gcc-12
steps:
- uses: actions/checkout@v4
- name: CMake
run: |
sudo apt-get update
sudo apt-get install libhdf5-dev g++-12
CXX=g++-12 cmake -B build
sudo apt-get install libhdf5-dev $CXX $CC
cmake -B build
- name: Build
run: VERBOSE=true make -C build -j `nproc`
- name: Test
run: ctest --test-dir ./build/test/bash

clang:
runs-on: 'ubuntu-latest'
env:
CXX: clang++
CC: clang
steps:
- uses: actions/checkout@v4
- name: CMake
run: |
sudo apt-get update
sudo apt-get install libhdf5-dev clang
cmake -B build
- name: Build
run: VERBOSE=true make -C build -j `nproc`
- name: Test
Expand Down
7 changes: 6 additions & 1 deletion include/binsparse/detail/declamp_values.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ static inline void bsp_matrix_declamp_values(bsp_matrix_t matrix) {
real_value = bsp_suitesparse_declamp_impl_(real_value);
imaginary_value = bsp_suitesparse_declamp_impl_(imaginary_value);

values[i] = real_value + 1j * imaginary_value;
double _Complex complex_value;

((double*) &complex_value)[0] = real_value;
((double*) &complex_value)[1] = imaginary_value;

values[i] = complex_value;
}
}
}
14 changes: 10 additions & 4 deletions include/binsparse/matrix_market/matrix_market_read.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ static inline bsp_matrix_t bsp_mmread_explicit_array(const char* file_path,
double real_value, imaginary_value;
sscanf(buf, "%lf %lf", &real_value, &imaginary_value);

double _Complex value = real_value + 1j * imaginary_value;
double _Complex value;

((double*) &value)[0] = real_value;
((double*) &value)[1] = imaginary_value;

size_t i = count % matrix.ncols;
size_t j = count / matrix.ncols;
Expand Down Expand Up @@ -203,12 +206,15 @@ bsp_mmread_explicit_coordinate(const char* file_path, bsp_type_t value_type,
bsp_array_write(matrix.indices_1, count, j);
} else if (mm_type == BSP_MM_COMPLEX) {
unsigned long long i, j;
double real_value, complex_value;
sscanf(buf, "%llu %llu %lf %lf", &i, &j, &real_value, &complex_value);
double real_value, imaginary_value;
sscanf(buf, "%llu %llu %lf %lf", &i, &j, &real_value, &imaginary_value);
i--;
j--;

double _Complex value = real_value + 1j * complex_value;
double _Complex value;

((double*) &value)[0] = real_value;
((double*) &value)[1] = imaginary_value;

bsp_array_write(matrix.values, count, value);
bsp_array_write(matrix.indices_0, count, i);
Expand Down
5 changes: 5 additions & 0 deletions test/bash/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ download_data(https://suitesparse-collection-website.herokuapp.com/MM/Belcastro/
download_data(https://suitesparse-collection-website.herokuapp.com/MM/Pajek/IMDB.tar.gz
IMDB.tar.gz)

download_data(https://suitesparse-collection-website.herokuapp.com/MM/Bai/dwg961a.tar.gz
dwg961a.tar.gz)

find_program(BASH_PROGRAM bash)

enable_testing()
Expand All @@ -31,9 +34,11 @@ if(BASH_PROGRAM)
add_test(NAME integration.1138_bus COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test.sh ${CMAKE_BINARY_DIR}/data/1138_bus.tar.gz)
add_test(NAME integration.mouse_gene COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test.sh ${CMAKE_BINARY_DIR}/data/mouse_gene.tar.gz)
add_test(NAME integration.IMDB COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test.sh ${CMAKE_BINARY_DIR}/data/IMDB.tar.gz)
add_test(NAME integration.dwg961a COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test.sh ${CMAKE_BINARY_DIR}/data/dwg961a.tar.gz)

add_test(NAME integration.cpp.chesapeake COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test-cpp.sh ${CMAKE_BINARY_DIR}/data/chesapeake.tar.gz)
add_test(NAME integration.cpp.1138_bus COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test-cpp.sh ${CMAKE_BINARY_DIR}/data/1138_bus.tar.gz)
add_test(NAME integration.cpp.mouse_gene COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test-cpp.sh ${CMAKE_BINARY_DIR}/data/mouse_gene.tar.gz)
add_test(NAME integration.cpp.IMDB COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test-cpp.sh ${CMAKE_BINARY_DIR}/data/IMDB.tar.gz)
add_test(NAME integration.cpp.dwg961a COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/test-cpp.sh ${CMAKE_BINARY_DIR}/data/dwg961a.tar.gz)
endif()