MacOS Support #174
Merged
MacOS Support #174
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KowerKoint
commented
Sep 24, 2024
.github/workflows/format.yml
Outdated
There was a problem hiding this comment.
formatだけ別のworkflowにすることで、ビルドの時間を待つことなくすぐにformat忘れがわかるようにした
There was a problem hiding this comment.
CPU版とGPU版を1種類のjobにしてmatrixで分けた
| runs-on: ${{ matrix.runs-on }} | ||
| env: | ||
| CMAKE_C_COMPILER: ${{ matrix.os == 'macos' && '/usr/local/opt/ccache/libexec/gcc-14' || '/usr/lib/ccache/gcc' }} | ||
| CMAKE_CXX_COMPILER: ${{ matrix.os == 'macos' && '/usr/local/opt/ccache/libexec/g++-14' || '/usr/lib/ccache/g++' }} |
There was a problem hiding this comment.
Macではg++の中身はclang++になっているので…
| SCALUQ_CUDA_ARCH: "PASCAL61" | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
There was a problem hiding this comment.
公式runnerに入っているもののパッケージを見て、GCCやCMakeのインストールは不要なことがわかったので消しました
| key: "${{ github.job }}-${{ matrix.os }}-${{ matrix.device }}" | ||
| verbose: 2 | ||
|
|
||
| - name: Install CUDA toolkit |
There was a problem hiding this comment.
このstepが圧倒的に重いのでなんとかしたい………
CUDA版のCI用のイメージをghcr.ioに作っておいておくとか
| for (size_t i = 0; i < view_d.extent(0); ++i) { | ||
| for (size_t j = 0; j < view_d.extent(1); ++j) { | ||
| for (std::size_t i = 0; i < view_d.extent(0); ++i) { | ||
| for (std::size_t j = 0; j < view_d.extent(1); ++j) { |
| @@ -217,7 +217,7 @@ TEST(StateVectorTest, SamplingSuperpositionState) { | |||
| state.add_state_vector_with_coef(1 << i, tmp_state); | |||
| } | |||
| state.normalize(); | |||
| std::vector<size_t> res = state.sampling(nshot); | |||
| std::vector<std::uint64_t> res = state.sampling(nshot); | |||
There was a problem hiding this comment.
macosではsize_tとstd::uint64_tが等しくないらし(32bitなのかsignedなのか…)くてエラーが起きたので修正しました
|
intel Macを持っていないので生成されたwheelの検証が現状できていませんが、CIでは動いているのでとりあえずマージしたいと思っています。 |
KowerKoint
force-pushed
the
137-macos
branch
from
f6c1fc8 to
fc09b84
Compare
|
Intel Mac (python 3.10) での動作確認をやっていただきました |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
x86_64版のみですが、MacOSをサポートしました。
ついでにworkflow fileなどをいろいろ整理しました。