Skip to content

Commit

Permalink
moved vendored scs folder to avoid naming conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
enzbus committed Oct 8, 2023
1 parent 951ce78 commit a7d0868
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "scs"]
path = scs
path = scs_source
url = https://github.com/cvxgrp/scs.git
65 changes: 48 additions & 17 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,59 @@ print(incdir)
check: true
).stdout().strip()

incdir = include_directories('scs/include')
incdir = include_directories('scs_source/include')
pyincdir = include_directories('src')
linsysinc = include_directories('scs/linsys')
indirectinc = include_directories('scs/linsys/cpu/indirect')
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

py.extension_module(
'_scs_direct',

'src/scspy.c',
'scs/src/aa.c',
'scs/src/cones.c',
'scs/src/ctrlc.c',
'scs/src/exp_cone.c',
'scs/src/linalg.c',
'scs/src/normalize.c',
'scs/src/rw.c',
'scs/src/scs_version.c',
'scs/src/scs.c',
'scs/src/util.c',
'scs/linsys/scs_matrix.c',
'scs/linsys/csparse.c',
'scs/linsys/cpu/indirect/private.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, indirectinc, incdir_numpy],
incdir, pyincdir, linsysinc, directinc, qdldlinc, amdinc, incdir_numpy],
install: true,
)

0 comments on commit a7d0868

Please sign in to comment.