Skip to content
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.

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

CMakeLists.txt search for any python version by default #1340

Merged
merged 3 commits into from
Sep 29, 2017

Conversation

ahundt
Copy link

@ahundt ahundt commented Sep 26, 2017

Could #1334 be reverted so this can be applied?

See #1131 and #1322 for details on the evolution of these changes.

@ahundt ahundt mentioned this pull request Sep 26, 2017
@erwincoumans
Copy link
Member

There is some conflict. instead of reverting can you please create a clean client and just copy over some working cmakelists.txt file? Thanks for looking into this!

* master: (35 commits)
  add __init__.py file in agents folder
  bump up pybullet version, instruction to visualize agents ppo:
  add TensorFlow Agents PPO training script for various pybullet environments:
  bump up pybullet version
  add minitaur environment randomizer, enable it by default this improves PPO training ( more stable)
  fix compile issue on MSVC
  expose gear erp/relative position target to C-API/pybullet finish much better C++ vrSyncPlugin, running in-the-loop with the physics at high frequency, see also vr_kuka_setup_vrSyncPlugin.py
  return -1 for debugDrawItems in DIRECT mode, instead of failing the API
  bump up shared memory version number add option to recompute forward kinematics, to be consistent with link velocities in pybullet.getLinkState (..., computeForwardKinematics=0/1), thanks to Jeff Bingham for bringing up this inconsistency
  add experimental vrSyncPlugin, that syncs the position/orientation of a vr controller to a gripper (through a constraint) This is in C++ and the sync runs at the simulation speed (240 Hz), so there is less lag than in Python. Modify the pybullet/examples/vr_kuka_setup.py at the end to do this:
  fix a bug in a changeVisualShape/texture selection, out-of-bounds check was using the wrong array. May fix some internal texture mug bug.
  fix a compile error on Windows (variables need to be declared together at the start of a block in C)
  fix compile warnings
  Update b3PluginManager.cpp
  tweak pybullet examples a bit (mac OSX OpenGL runs in mainloop, with python interpreter, so it needs some 'ping' command bump up pybullet to version 1.4.6
  [sharedmemory] Fill-out calculateJacobian command.
  add some missing files for premake, thanks to Jeff Bingham for the report
  add a few more contributors (the list is far from complete though)
  manually apply pull request 457 PR bulletphysics#457 Thanks to aaronmjacobs!
  Update pybullet.c
  ...

# Conflicts:
#	CMakeLists.txt
@ahundt
Copy link
Author

ahundt commented Sep 27, 2017

@erwincoumans merged with master, hopefully everything behaves in a way that meets requirements this time. :-)

@erwincoumans
Copy link
Member

erwincoumans commented Sep 27, 2017

Thanks for working on this, but Travis CI fails:
Nope: -- Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found version "3.4.3")

https://travis-ci.org/bulletphysics/bullet3/builds/280595688?utm_source=github_status&utm_medium=notification

@erwincoumans
Copy link
Member

the current find python scripts finds it just fine:
https://travis-ci.org/bulletphysics/bullet3/jobs/280975587
-- Found PythonLibs: /usr/lib/x86_64-linux-gnu/libpython3.4m.so (found version "3.4.3")
so why does your updated script not find it there?

@ahundt
Copy link
Author

ahundt commented Sep 29, 2017

@erwincoumans the script never previously searched for anything ending in an m. I updated it to include the m so it will look for libpython3.4m.so in addition to libpython3.4.so as a possible filename.

@ahundt
Copy link
Author

ahundt commented Sep 29, 2017

@erwincoumans passes 👍

@erwincoumans erwincoumans merged commit d881d15 into bulletphysics:master Sep 29, 2017
@erwincoumans
Copy link
Member

Just in time for the 2.87 tagged release: https://github.com/bulletphysics/bullet3/releases/tag/2.87

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants