Browse Source

Merge branch 'develop' of https://github.com/PaddlePaddle/PaddleX into develop_jf

will-jl944 4 years ago
parent
commit
f2060a4b20
2 changed files with 6 additions and 4 deletions
  1. 3 2
      requirements.txt
  2. 3 2
      setup.py

+ 3 - 2
requirements.txt

@@ -4,11 +4,12 @@ colorama
 cython
 pycocotools
 visualdl >= 2.1.1
-paddleslim == 2.1.0
+paddleslim >= 2.1.1
 shapely
-paddlepaddle-gpu==2.1.1
+paddlepaddle-gpu==2.1.2
 opencv-python
 scikit-learn==0.23.2
 lap
 motmetrics
 matplotlib
+chardet

+ 3 - 2
setup.py

@@ -30,8 +30,9 @@ setuptools.setup(
     setup_requires=['cython', 'numpy'],
     install_requires=[
         "pycocotools;platform_system!='Windows'", 'pyyaml', 'colorama', 'tqdm',
-        'paddleslim==2.1.0', 'visualdl>=2.1.1', 'shapely>=1.7.0',
-        'opencv-python', 'scipy', 'lap', 'motmetrics', 'scikit-learn==0.23.2'
+        'paddleslim>=2.1.2', 'visualdl>=2.1.1', 'shapely>=1.7.0',
+        'opencv-python', 'scipy', 'lap', 'motmetrics', 'scikit-learn==0.23.2', 
+        'chardet'
     ],
     classifiers=[
         "Programming Language :: Python :: 3",