Hopefully fixes builds on 3.12. #70
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| [submodule "scs"] | ||
| path = scs_source | ||
| url = https://github.com/cvxgrp/scs.git |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| project('scs', 'c') | ||
|
|
||
| py = import('python').find_installation(pure: false) | ||
|
|
||
| # This uses the path as is, and avoids running the interpreter. | ||
| incdir_numpy = run_command(py, | ||
| [ | ||
| '-c', | ||
| '''import os | ||
| import numpy as np | ||
| incdir = np.get_include() | ||
| print(incdir) | ||
| ''' | ||
| ], | ||
| check: true | ||
| ).stdout().strip() | ||
|
There was a problem hiding this comment. This is the one annoying thing you have to do indeed - I will get around to replacing all this with a simple For now, I'd recommend to include the That will ensure things work fine with an in-tree virtual environment (so There was a problem hiding this comment. Ok, I guess fixed (there are more try/except there that I don't understand). |
||
|
|
||
| incdir = include_directories('scs_source/include') | ||
| pyincdir = include_directories('src') | ||
| linsysinc = include_directories('scs_source/linsys') | ||
| directinc = include_directories('scs_source/linsys/cpu/direct') | ||
| qdldlinc = include_directories('scs_source/linsys/external/qdldl') | ||
| amdinc = include_directories('scs_source/linsys/external/amd') | ||
|
|
||
|
|
||
| # meson doesn't support wildcards | ||
| # https://mesonbuild.com/FAQ.html#why-cant-i-specify-target-files-with-a-wildcard | ||
|
There was a problem hiding this comment. Probably can be cleaned up as well now? |
||
|
|
||
| py.extension_module( | ||
| '_scs_direct', | ||
enzbus marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| 'src/scspy.c', | ||
| 'scs_source/linsys/cpu/direct/private.c', | ||
|
|
||
| # scs_source/src: | ||
| 'scs_source/src/aa.c', | ||
| 'scs_source/src/cones.c', | ||
| 'scs_source/src/ctrlc.c', | ||
| 'scs_source/src/exp_cone.c', | ||
| 'scs_source/src/linalg.c', | ||
| 'scs_source/src/normalize.c', | ||
| 'scs_source/src/rw.c', | ||
| 'scs_source/src/scs_version.c', | ||
| 'scs_source/src/scs.c', | ||
| 'scs_source/src/util.c', | ||
|
|
||
| # scs_source/linsys: | ||
| 'scs_source/linsys/scs_matrix.c', | ||
| 'scs_source/linsys/csparse.c', | ||
|
|
||
| # scs_source/linsys/external/qdldl: | ||
| 'scs_source/linsys/external/qdldl/qdldl.c', | ||
|
|
||
| # scs_source/linsys/external/amd: | ||
| 'scs_source/linsys/external/amd/amd_1.c', | ||
| 'scs_source/linsys/external/amd/amd_2.c', | ||
| 'scs_source/linsys/external/amd/amd_aat.c', | ||
| 'scs_source/linsys/external/amd/amd_control.c', | ||
| 'scs_source/linsys/external/amd/amd_defaults.c', | ||
| 'scs_source/linsys/external/amd/amd_dump.c', | ||
| 'scs_source/linsys/external/amd/amd_global.c', | ||
| 'scs_source/linsys/external/amd/amd_info.c', | ||
| 'scs_source/linsys/external/amd/amd_order.c', | ||
| 'scs_source/linsys/external/amd/amd_post_tree.c', | ||
| 'scs_source/linsys/external/amd/amd_postorder.c', | ||
| 'scs_source/linsys/external/amd/amd_preprocess.c', | ||
| 'scs_source/linsys/external/amd/amd_valid.c', | ||
| 'scs_source/linsys/external/amd/SuiteSparse_config.c', | ||
|
|
||
| include_directories : [ | ||
| incdir, pyincdir, linsysinc, directinc, qdldlinc, amdinc, incdir_numpy], | ||
| install: true, | ||
| ) | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,14 @@ | ||
| [build-system] | ||
| build-backend = 'mesonpy' | ||
| requires = ['meson-python', 'numpy'] | ||
|
|
||
| [project] | ||
| name = 'scs' | ||
| version = "3.2.3" | ||
enzbus marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| description = 'Splitting conic solver' | ||
| readme = 'README.md' | ||
| requires-python = '>=3.8' | ||
| license = {file = 'LICENSE'} | ||
| authors = [ | ||
| {name = "Brendan O'Donoghue", email = "[email protected]"}, | ||
| ] | ||
Submodule scs_source
updated
from 000000 to fa32d8
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor: this comment is a left-over and doesn't apply, so best to clean it up.