Skip to content

Commit

Permalink
add the missing MEXLINKLIBS variable
Browse files Browse the repository at this point in the history
  • Loading branch information
fangq committed Aug 5, 2023
1 parent 82367f0 commit b781036
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ script:
- chmod +x .github/check-pypi-upload.sh
- GITHUB_OUTPUT=./pypi_upload .github/check-pypi-upload.sh

deploy:
provider: pypi
username: "__token__"
distributions: "bdist_wheel"
password:
secure: cY74UjxKDiP3tTgQoYlAt06MlD8A1t2HPDDWqv+8UN9O0npoBZvyheXkaGRxd5Qx8CmapI12KfLCZl4wC3xEh9zUtPn20JwglKOYi6myOtnzn1QtUU9cNsP3IOFdZmDUNivaa02vyCONwg98d7nRUKaG9OoIJ7dN1zO26gT8G0cY5xnwmqw9ycwqQWb5waRFxS9Pel4QA3jm8gRC7FYezXWkvwLSCsMHPvf4ddYiMk5aTKmASAJ2gvieHzefuoswB+ujHUDt+UMwlr9iL9QgIwJtV6jO0z5aW7ruOSQa6ZvbN62Vtrd/ocY7ADx5MeOOb3S8hDsI7a1osJHGQKePzE22+dcBU92UOWfkEgefzdd2L26kyst3Qjlqh3eR4frPUTQUipeK/XIQ4o0sL4gMd4zXpXskyUXQr6Y0EsdRT5buDure2qiLBVA+3USTKCv8Gu2WJIwHwrNab0LThtAtKkgiwvebQBEbRYR2mkJicjZYJSsvEbL7aKounBxNv2lqOl+wul9sH5BEWcnBrbZ5h15BbNGJoTjmNQINTbkNSvsITHA2u3CT7aRL+WJ6XuoRSX8WNOn8+OLaOJoHSCpoDo6MR4Z+B4Q0IGvjdbOmzH3KVYopGjQb1YCu+a5m+QqRKO7SXAX6aJd9KLav9mLUIWVZCvFodvEhJwuW34RqeG8=
edge: true
#deploy:
# provider: pypi
# username: "__token__"
# distributions: "bdist_wheel"
# password:
# secure: cY74UjxKDiP3tTgQoYlAt06MlD8A1t2HPDDWqv+8UN9O0npoBZvyheXkaGRxd5Qx8CmapI12KfLCZl4wC3xEh9zUtPn20JwglKOYi6myOtnzn1QtUU9cNsP3IOFdZmDUNivaa02vyCONwg98d7nRUKaG9OoIJ7dN1zO26gT8G0cY5xnwmqw9ycwqQWb5waRFxS9Pel4QA3jm8gRC7FYezXWkvwLSCsMHPvf4ddYiMk5aTKmASAJ2gvieHzefuoswB+ujHUDt+UMwlr9iL9QgIwJtV6jO0z5aW7ruOSQa6ZvbN62Vtrd/ocY7ADx5MeOOb3S8hDsI7a1osJHGQKePzE22+dcBU92UOWfkEgefzdd2L26kyst3Qjlqh3eR4frPUTQUipeK/XIQ4o0sL4gMd4zXpXskyUXQr6Y0EsdRT5buDure2qiLBVA+3USTKCv8Gu2WJIwHwrNab0LThtAtKkgiwvebQBEbRYR2mkJicjZYJSsvEbL7aKounBxNv2lqOl+wul9sH5BEWcnBrbZ5h15BbNGJoTjmNQINTbkNSvsITHA2u3CT7aRL+WJ6XuoRSX8WNOn8+OLaOJoHSCpoDo6MR4Z+B4Q0IGvjdbOmzH3KVYopGjQb1YCu+a5m+QqRKO7SXAX6aJd9KLav9mLUIWVZCvFodvEhJwuW34RqeG8=
# edge: true
2 changes: 1 addition & 1 deletion pymcx
5 changes: 4 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ZMATLIB :=lib/libzmat.a
ZLIBFLAG :=
USERLINKOPT?=$(ZMATLIB) $(ZLIBFLAG)

CUDART=-lcudart
CUDART=-lcudart_static
CUOMPLINK=

ARCH = $(shell uname -m)
Expand Down Expand Up @@ -69,6 +69,8 @@ CPPFLAGS+=-g -Wall #-DNO_LZMA # -DUSE_OS_TIMER
OBJSUFFIX=.o
EXESUFFIX=

MEXLINKLIBS=-L"\$$TMW_ROOT\$$MATLABROOT/extern/lib/\$$ARCH" -L"\$$TMW_ROOT\$$MATLABROOT/bin/\$$ARCH" -lmx -lmex -L$(CUDA_HOME)/lib $(CUDART)

FILES=mcx_core mcx_utils mcx_shapes mcx_tictoc mcx mcx_bench mcx_mie cjson/cJSON ubj/ubjw

ifeq ($(findstring _NT-,$(PLATFORM)), _NT-)
Expand Down Expand Up @@ -97,6 +99,7 @@ ifeq ($(findstring _NT-,$(PLATFORM)), _NT-)
ZLIBFLAG?=
ZMATLIB :=zmat/zmatlib.obj zmat/lz4/lz4.obj zmat/lz4/lz4hc.obj zmat/easylzma/*.obj zmat/easylzma/pavlov/*.obj
USERLINKOPT:=${LIBRARIES} $(ZMATLIB) $(ZLIBFLAG)
MEXLINKLIBS="\$$LINKLIBS"
else ifeq ($(findstring Darwin,$(PLATFORM)), Darwin)
CUDA_STATIC=--cudart static
CPPOPT+=$(OMP)
Expand Down
2 changes: 1 addition & 1 deletion src/pybind11
Submodule pybind11 updated 79 files
+61 −65 .clang-tidy
+3 −5 .github/CONTRIBUTING.md
+4 −0 .github/dependabot.yml
+23 −40 .github/workflows/ci.yml
+1 −1 .github/workflows/configure.yml
+4 −6 .github/workflows/format.yml
+5 −7 .github/workflows/pip.yml
+3 −3 .github/workflows/upstream.yml
+11 −14 .pre-commit-config.yaml
+0 −13 CMakeLists.txt
+0 −3 docs/_static/css/custom.css
+11 −0 docs/_static/theme_overrides.css
+2 −2 docs/advanced/cast/custom.rst
+3 −3 docs/advanced/cast/stl.rst
+2 −2 docs/advanced/classes.rst
+2 −2 docs/advanced/pycpp/numpy.rst
+1 −1 docs/advanced/smart_ptrs.rst
+12 −160 docs/changelog.rst
+1 −1 docs/classes.rst
+17 −6 docs/conf.py
+ docs/pybind11-logo.png
+3 −4 docs/requirements.txt
+3 −5 include/pybind11/attr.h
+5 −5 include/pybind11/cast.h
+30 −23 include/pybind11/detail/class.h
+2 −21 include/pybind11/detail/common.h
+1 −1 include/pybind11/detail/init.h
+0 −1 include/pybind11/detail/internals.h
+66 −0 include/pybind11/detail/type_caster_base.h
+3 −9 include/pybind11/detail/typeid.h
+6 −17 include/pybind11/eigen.h
+32 −56 include/pybind11/embed.h
+2 −2 include/pybind11/functional.h
+1 −1 include/pybind11/iostream.h
+8 −19 include/pybind11/numpy.h
+26 −44 include/pybind11/pybind11.h
+64 −338 include/pybind11/pytypes.h
+6 −6 include/pybind11/stl.h
+6 −16 noxfile.py
+1 −2 pybind11/__init__.py
+1 −8 pybind11/__main__.py
+1 −1 pybind11/_version.py
+0 −12 pybind11/commands.py
+1 −2 setup.cfg
+0 −1 setup.py
+0 −1 tests/CMakeLists.txt
+1 −14 tests/conftest.py
+0 −51 tests/cross_module_interleaved_error_already_set.cpp
+58 −68 tests/extra_python_package/test_files.py
+0 −25 tests/pybind11_tests.cpp
+1 −1 tests/requirements.txt
+2 −8 tests/test_builtin_casters.cpp
+2 −2 tests/test_constants_and_functions.cpp
+7 −7 tests/test_custom_type_casters.cpp
+2 −5 tests/test_eigen.cpp
+0 −7 tests/test_eigen.py
+1 −1 tests/test_embed/CMakeLists.txt
+2 −47 tests/test_exceptions.cpp
+3 −99 tests/test_exceptions.py
+1 −10 tests/test_kwargs_and_defaults.cpp
+9 −21 tests/test_methods_and_attributes.py
+0 −2 tests/test_modules.cpp
+0 −30 tests/test_modules.py
+1 −1 tests/test_numpy_array.cpp
+1 −1 tests/test_numpy_dtypes.cpp
+1 −1 tests/test_numpy_vectorize.cpp
+0 −183 tests/test_pytypes.cpp
+0 −129 tests/test_pytypes.py
+2 −2 tests/test_smart_ptr.cpp
+8 −15 tests/test_stl.cpp
+2 −2 tests/test_tagbased_polymorphic.cpp
+3 −2 tests/test_virtual_functions.cpp
+11 −21 tools/FindPythonLibsNew.cmake
+0 −23 tools/JoinPaths.cmake
+0 −7 tools/pybind11.pc.in
+1 −3 tools/pybind11NewTools.cmake
+11 −32 tools/pybind11Tools.cmake
+0 −2 tools/setup_global.py.in
+0 −2 tools/setup_main.py.in

0 comments on commit b781036

Please sign in to comment.