8000 Bump python version to 3.8 · silvery107/rl-mpc-locomotion@adcd1af · GitHub
[go: up one dir, main page]
Skip to content

Commit adcd1af

Browse files
silvery107silvery107
committed
Bump python version to 3.8
1 parent dc90e50 commit adcd1af

File tree

3 files changed

+9
-60
lines changed

3 files changed

+9
-60
lines changed

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ The RL training utilizes the [NVIDIA Isaac Gym](https://developer.nvidia.com/isa
1111
<img src="images/controller_blocks.png" width=700>
1212

1313
## Dependencies
14-
- [* 8000 PyTorch* - 1.8.1](https://pytorch.org/get-started/previous-versions/)
14+
- *Python* - 3.8
15+
- [*PyTorch* - 1.10.0 with CUDA 11.3](https://pytorch.org/get-started/previous-versions/)
1516
- [*Isaac Gym* - Preview 4](https://developer.nvidia.com/isaac-gym)
16-
- *Python 3.7*
1717
<!-- - *OSQP* - 0.6.2 -->
1818

1919
## Installation
20-
2120
1. Clone this repository
2221
```bash
2322
git clone git@github.com:silvery107/rl-mpc-locomotion.git

‎environment.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@ channels:
44
- conda-forge
55
- defaults
66
dependencies:
7-
- python=3.7
8-
- pytorch=1.8.1
9-
- torchvision=0.9.1
10-
- cudatoolkit=11.1
7+
- python=3.8
8+
- pytorch=1.10.0
9+
- cudatoolkit=11.3
1110
- pyyaml>=5.3.1
1211
- scipy>=1.5.0
1312
- tensorboard>=2.2.1
14-
- osqp # conda install -c conda-forge osqp
1513
- pybind11 # conda install -c conda-forge pybind11
1614
- scipy # conda install scipy
17-
# - pybullet # conda install -c conda-forge pybullet
15+
# - osqp # conda install -c conda-forge osqp
1816
- pip:
1917
- rl_games == 1.1.4
20-
- inputs
18+
- inputs == 0.5
2119
- hydra-core == 1.1.0
2220
- omegaconf == 2.1
21+
# - pybullet # pip install pybullet

‎setup.py‎

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
#
2-
# Copyright 2022 Yulun Zhuang
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
161
from setuptools import find_packages
172
from sys import platform as _platform
183
import os
@@ -181,16 +166,6 @@ def _single_compile(obj):
181166
CXX_FLAGS += '-Wno-unused-local-typedefs '
182167
CXX_FLAGS += '-Wno-unused-variable '
183168
CXX_FLAGS += '-Wno-unused-but-set-variable '
184-
185-
elif _platform == "win32":
186-
print("win32!")
187-
include_dirs += ['extern/osqp/include/windows']
188-
print(include_dirs)
189-
libraries = ['User32', 'kernel32']
190-
#CXX_FLAGS += '-DIS_WINDOWS '
191-
CXX_FLAGS += '-DWIN32 '
192-
CXX_FLAGS += '-DGLEW_STATIC '
193-
CXX_FLAGS += '/std:c++17 '
194169
elif _platform == "darwin":
195170
print("darwin!")
196171
CXX_FLAGS += '-fpermissive '
@@ -204,14 +179,7 @@ def _single_compile(obj):
204179
CXX_FLAGS += '-mmacosx-version-min=10.7 '
205180
# CXX_FLAGS += '-framework Cocoa '
206181
else:
207-
print("bsd!")
208-
include_dirs += ['extern/osqp/include/linux']
209-
libraries = ['GL', 'GLEW', 'pthread']
210-
os.environ['LDFLAGS'] = '-L/usr/X11R6/lib'
211-
CXX_FLAGS += '-D_BSD '
212-
CXX_FLAGS += '-I/usr/X11R6/include '
213-
CXX_FLAGS += '-DHAS_SOCKLEN_T '
214-
CXX_FLAGS += '-fno-inline-functions-called-once'
182+
raise NotImplementedError(f"OS not support: {_platform}")
215183

216184
setup_py_dir = os.path.dirname(os.path.realpath(__file__))
217185

@@ -244,22 +212,5 @@ def _single_compile(obj):
244212
'numpy'
245213
],
246214
ext_modules=extensions,
247-
classifiers=[
248-
'Development Status :: 5 - Production/Stable',
249-
'License :: OSI Approved :: zlib/libpng License',
250-
'Operating System :: Microsoft :: Windows',
251-
'Operating System :: POSIX :: Linux', 'Operating System :: MacOS',
252-
'Intended Audience :: Science/Research',
253-
"Programming Language :: Python",
254-
'Programming Language :: Python :: 2.7',
255-
'Programming Language :: Python :: 3.4',
256-
'Programming Language :: Python :: 3.5',
257-
'Programming Language :: Python :: 3.6',
258-
'Programming Language :: Python :: 3.7',
259-
'Programming Language :: Python :: 3.8',
260-
'Topic :: Games/Entertainment :: Simulation',
261-
'Topic :: Scientific/Engineering :: Artificial Intelligence',
262-
'Framework :: Robot Framework'
263-
],
264215
packages=[x for x in find_packages('.')],
265216
)

0 commit comments

Comments
 (0)
0