Skip to content

Feature/remove scipy#481

Merged
K-Suzuki-Jij merged 6 commits intomainfrom
feature/remove-scipy
Jul 23, 2025
Merged

Feature/remove scipy#481
K-Suzuki-Jij merged 6 commits intomainfrom
feature/remove-scipy

Conversation

@K-Suzuki-Jij
Copy link
Contributor

@K-Suzuki-Jij K-Suzuki-Jij commented Jul 18, 2025

Changes

  • OpenJijからscipy依存性を消しました。これによりnumpy2系がインストールされるようになります。ただしtest時には必要なためtestのときのみscipyがインストールされます。
  • macのビルドにおいてbrewが入れたlibompが存在するか判定してる箇所が判定できてなかったので修正しました。macにおいてlibompが存在しない状態でpip install .ができることを確認しました。

@K-Suzuki-Jij K-Suzuki-Jij requested review from 29rou and j-i-k-o July 18, 2025 02:47
@29rou 29rou requested a review from Copilot July 18, 2025 02:50
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This pull request removes the SciPy dependency from OpenJij, enabling the installation of NumPy 2.x series, and fixes a macOS build issue with libomp detection.

  • Removed SciPy dependency from package requirements
  • Updated test code to use NumPy arrays directly instead of SciPy sparse matrices
  • Fixed CMake libomp detection logic on macOS to properly check if libomp is installed before attempting to use it

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
setup.cfg Removed scipy dependency from install_requires
tests/test_cxx.py Replaced scipy.sparse usage with direct NumPy arrays and removed scipy import
CMakeLists.txt Fixed libomp detection logic to check installation before getting prefix path

Copy link
Collaborator

@j-i-k-o j-i-k-o left a comment

Choose a reason for hiding this comment

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

一点気になった箇所をコメントしました。

@K-Suzuki-Jij K-Suzuki-Jij requested a review from j-i-k-o July 23, 2025 07:08
Copy link
Collaborator

@j-i-k-o j-i-k-o left a comment

Choose a reason for hiding this comment

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

LGTM

@K-Suzuki-Jij K-Suzuki-Jij merged commit 8b5c9c1 into main Jul 23, 2025
20 checks passed
@K-Suzuki-Jij K-Suzuki-Jij deleted the feature/remove-scipy branch July 23, 2025 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants