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.

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

Jump to bottom

merge_gateのcontrol, DenseMatrix対応 #180

Closed
wants to merge 15 commits into from
Closed

merge_gateのcontrol, DenseMatrix対応 #180

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9c33854
merge gate[WIP]
KowerKoint Oct 23, 2024
85c3191
implement merge_gate generally
KowerKoint Oct 25, 2024
a73d578
merge_gate test
KowerKoint Oct 25, 2024
5cf7ad0
[WIP]
KowerKoint Oct 25, 2024
7700e79
devcontainer include
Nov 6, 2024
fb3ecea
fix CMake
Nov 6, 2024
4c2a3f6
merge_gate fix
Nov 6, 2024
beea18b
remove useless dump
Nov 6, 2024
c4f1e23
remove useless file
Nov 6, 2024
8c969e0
remove debug output
Nov 6, 2024
f5caa60
fix comment
Nov 6, 2024
75d3363
add SCALUQ_USE_EXE
Nov 6, 2024
74f1560
remove numpy from ci extra dep
Nov 6, 2024
c38c4d5
fix control_mask check
Nov 6, 2024
4bdf5b1
remove useless main.py
Nov 6, 2024
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
4 changes: 2 additions & 2 deletions .devcontainer/cpu/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"C_Cpp.default.includePath": [
"scaluq",
"/usr/local/include/kokkos",
"build/_deps/eigen_fetch-src",
"build/_deps/googletest_fetch-src/googletest/include",
"build/_deps/eigen-src",
"build/_deps/googletest-src/googletest/include",
Comment on lines +34 to +35
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FetchContent_MakeAvailableを使うようにしたとき、ディレクトリの名前が変わっていました

"~/.local/lib/python3.10/site-packages/nanobind/include",
"/usr/include/python3.10"
],
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/gpu/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"C_Cpp.default.includePath": [
"scaluq",
"/usr/local/include/kokkos",
"build/_deps/eigen_fetch-src",
"build/_deps/googletest_fetch-src/googletest/include",
"build/_deps/eigen-src",
"build/_deps/googletest-src/googletest/include",
"~/.local/lib/python3.10/site-packages/nanobind/include",
"/usr/include/python3.10"
],
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ if ((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") OR (${CMAKE_CXX_COMPILER_ID} STREQ
endif()

# Debug options
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR CMAKE_CUDA_COMPILER)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SCALUQ_USE_CUDA=Yesのとき

g++: fatal error: cannot specify ‘-o’ with ‘-c’, ‘-S’ or ‘-E’ with multiple files
compilation terminated.

があったので対応

target_compile_options(scaluq PUBLIC $<IF:$<CONFIG:Debug>,-O0 -g,-O3>)
else()
target_compile_options(scaluq PUBLIC $<IF:$<CONFIG:Debug>,-O0 -g -fsanitize=address$<COMMA>undefined,-O3>)
Expand Down
Loading
Loading