Skip to content

Feature/remove scipy #481

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
K-Suzuki-Jij merged 6 commits into from
Jul 23, 2025
Merged

Feature/remove scipy #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07e5abe
remove scipy
K-Suzuki-Jij Jul 18, 2025
c52f8c7
Fix bugg
K-Suzuki-Jij Jul 18, 2025
43e0460
scipy依存性排除
K-Suzuki-Jij Jul 18, 2025
fe7a58c
Fix
K-Suzuki-Jij Jul 18, 2025
bcf0c97
revert tests
K-Suzuki-Jij Jul 23, 2025
72d487c
update test environment
K-Suzuki-Jij Jul 23, 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
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,13 @@ if (APPLE)
add_compile_options(-Wno-unused-command-line-argument)
find_program(BREW_EXECUTABLE brew)
if(BREW_EXECUTABLE)
execute_process(COMMAND brew --prefix libomp COMMAND tr -d '\n' OUTPUT_VARIABLE OMP_DIR)
if(OMP_DIR)
execute_process(
COMMAND ${BREW_EXECUTABLE} list libomp
RESULT_VARIABLE IS_LIBOMP_INSTALLED
OUTPUT_QUIET ERROR_QUIET
)
if(IS_LIBOMP_INSTALLED EQUAL 0)
execute_process(COMMAND brew --prefix libomp COMMAND tr -d '\n' OUTPUT_VARIABLE OMP_DIR)
message(STATUS "Found libomp at: ${OMP_DIR}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -lomp -Wno-unused-command-line-argument")
include_directories(SYSTEM ${OMP_DIR}/include)
Expand Down
1 change: 1 addition & 0 deletions dev-requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ pytest-runner
pytest-randomly
pytest-spec
coverage
scipy # Required for test_cxx.py CSRSparse tests
1 change: 0 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ python_requires = >=3.8, <3.13
install_requires =
numpy >=1.17.3, < 2.4.0
dimod < 0.13.0
scipy >= 1.7.3, < 1.12.0
requests >= 2.28.0, < 2.32.0
jij-cimod >= 1.6.0, < 1.8.0
typing-extensions >= 4.2.0
Expand Down
1 change: 0 additions & 1 deletion tests/test_cxx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import openjij.cxxjij.result as R
from scipy import sparse


class CXXTest(unittest.TestCase):

def setUp(self):
Expand Down
Loading