Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1.0..3.14)
cmake_minimum_required(VERSION 3.5)

project(nlopt-python)

Expand Down
2 changes: 1 addition & 1 deletion extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def build_extension(self, ext: Extension):
], cwd=build_dir)

# Copy over the important bits
nlopt_py = build_dir / "extern" / "nlopt" / "src" / "swig" / "nlopt.py"
nlopt_py = build_dir / "extern" / "nlopt" / "src" / "swig" / "python" / "nlopt.py"

logging.info(f"Ext Dir - {ext_dir}\n" + '\n'.join(f' - {file.as_posix()}' for file in ext_dir.rglob('*')))
for folder in [ext_dir, nlopt_py.parent]:
Expand Down
2 changes: 1 addition & 1 deletion extern/nlopt
Submodule nlopt updated 68 files
+7 −4 .github/workflows/build.yml
+35 −13 CMakeLists.txt
+18 −2 NEWS.md
+1 −1 README.md
+0 −86 cmake/FindNumPy.cmake
+0 −100 cmake/TargetLinkLibrariesWithDynamicLookup.cmake
+12 −0 doc/docs/NLopt_Algorithms.md
+12 −3 doc/docs/NLopt_C-plus-plus_Reference.md
+11 −2 doc/docs/NLopt_Guile_Reference.md
+432 −0 doc/docs/NLopt_Java_Reference.md
+12 −3 doc/docs/NLopt_Python_Reference.md
+52 −0 doc/docs/NLopt_Tutorial.md
+1 −1 doc/docs/index.md
+0 −2 src/algs/ags/solver.cc
+10 −7 src/algs/luksan/luksan.h
+2 −2 src/algs/luksan/plip.c
+2 −2 src/algs/luksan/plis.c
+2 −2 src/algs/luksan/pnet.c
+1 −1 src/algs/stogo/linalg.cc
+1 −1 src/algs/stogo/linalg.h
+1 −1 src/algs/stogo/tools.h
+2 −0 src/api/general.c
+15 −6 src/api/nlopt-in.hpp
+2 −0 src/api/nlopt.h
+3 −3 src/api/optimize.c
+1 −1 src/octave/NLOPT_AUGLAG.m
+1 −1 src/octave/NLOPT_AUGLAG_EQ.m
+1 −1 src/octave/NLOPT_GD_MLSL.m
+1 −1 src/octave/NLOPT_GD_MLSL_LDS.m
+1 −1 src/octave/NLOPT_GN_AGS.m
+1 −1 src/octave/NLOPT_GN_CRS2_LM.m
+1 −1 src/octave/NLOPT_GN_ESCH.m
+1 −1 src/octave/NLOPT_GN_ISRES.m
+1 −1 src/octave/NLOPT_GN_MLSL.m
+1 −1 src/octave/NLOPT_GN_MLSL_LDS.m
+1 −1 src/octave/NLOPT_G_MLSL.m
+1 −1 src/octave/NLOPT_G_MLSL_LDS.m
+1 −1 src/octave/NLOPT_LD_AUGLAG.m
+1 −1 src/octave/NLOPT_LD_AUGLAG_EQ.m
+1 −1 src/octave/NLOPT_LD_CCSAQ.m
+1 −1 src/octave/NLOPT_LD_LBFGS.m
+1 −1 src/octave/NLOPT_LD_MMA.m
+1 −1 src/octave/NLOPT_LD_SLSQP.m
+1 −1 src/octave/NLOPT_LD_TNEWTON.m
+1 −1 src/octave/NLOPT_LD_TNEWTON_PRECOND.m
+1 −1 src/octave/NLOPT_LD_TNEWTON_PRECOND_RESTART.m
+1 −1 src/octave/NLOPT_LD_TNEWTON_RESTART.m
+1 −1 src/octave/NLOPT_LD_VAR1.m
+1 −1 src/octave/NLOPT_LD_VAR2.m
+1 −1 src/octave/NLOPT_LN_AUGLAG.m
+1 −1 src/octave/NLOPT_LN_AUGLAG_EQ.m
+1 −1 src/octave/NLOPT_LN_BOBYQA.m
+1 −1 src/octave/NLOPT_LN_COBYLA.m
+1 −1 src/octave/NLOPT_LN_NELDERMEAD.m
+1 −1 src/octave/NLOPT_LN_NEWUOA.m
+1 −1 src/octave/NLOPT_LN_NEWUOA_BOUND.m
+1 −1 src/octave/NLOPT_LN_PRAXIS.m
+1 −1 src/octave/NLOPT_LN_SBPLX.m
+1 −1 src/octave/nlopt_minimize.m
+1 −1 src/octave/nlopt_minimize_constrained.m
+1 −1 src/octave/nlopt_optimize.m
+68 −17 src/swig/CMakeLists.txt
+14 −0 src/swig/glob_java.cmake
+229 −0 src/swig/nlopt-java.i
+18 −0 src/swig/nlopt.i
+32 −8 test/CMakeLists.txt
+56 −0 test/t_except.cxx
+55 −0 test/t_java.java