From 7c8ac064c83a66506b4bc483cf103e4efb411116 Mon Sep 17 00:00:00 2001
From: pangyoki <pangyoki@126.com>
Date: Fri, 27 Nov 2020 16:36:38 +0800
Subject: [PATCH] Delete prettytable in condabuild (#29145)

* update conda_build script with removing opencv

* modified filepath

* modified some content

* Delete Commented-Out Code

* delete prettytable in conda_build

Co-authored-by: XieYunshen <1084314248@qq.com>
---
 paddle/scripts/conda_build.py | 40 ++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/paddle/scripts/conda_build.py b/paddle/scripts/conda_build.py
index 395a071ed13..5102472e523 100644
--- a/paddle/scripts/conda_build.py
+++ b/paddle/scripts/conda_build.py
@@ -65,7 +65,6 @@ requirements:
     - astor
     - gast>=0.3.3
     - matplotlib
-    - opencv>=3.4.2
 """
 
         self.requirement_run_windows = r"""
@@ -100,13 +99,11 @@ about:
 
         self.build_const = r"""
 pip install /package/objgraph-3.4.1.tar.gz
-pip install /package/prettytable-0.7.tar.gz
 pip install /package/rarfile-3.0.tar.gz --no-deps
 """
 
         self.blt_const = r""" 
 pip install C:\package\objgraph-3.4.1.tar.gz
-pip install C:\package\prettytable-0.7.tar.gz
 pip install C:\package\rarfile-3.0.tar.gz --no-deps
 git clone https://github.com/PaddlePaddle/recordio.git
 cd recordio\python
@@ -117,22 +114,34 @@ python setup.py install
         self.python35 = r"    - python>=3.5, <3.6"
         self.python36 = r"    - python>=3.6, <3.7"
         self.python37 = r"    - python>=3.7, <3.8"
+        self.python38 = r"    - python>=3.8, <3.9"
 
         self.python_version = [
-            self.python27, self.python35, self.python36, self.python37
+            self.python27, self.python35, self.python36, self.python37,
+            self.python38
         ]
 
         self.cuda90 = r"""
     - cudatoolkit>=9.0, <9.1
-    - cudnn>=7.3, <7.4
+    - cudnn>=7.6, <7.7
     """
         self.cuda100 = r"""
     - cudatoolkit>=10.0, <10.1
     - cudnn>=7.6, <7.7
     """
-        self.cuda_info = [(self.cuda90, "cuda9.0", ".post97"),
-                          (self.cuda100, "cuda10.0", ".post107")]
-        self.py_str = ["py27", "py35", "py36", "py37"]
+        self.cuda101 = r"""
+    - cudatoolkit>=10.1, <10.2
+    - cudnn>=7.6, <7.7
+    """
+        self.cuda102 = r"""
+    - cudatoolkit>=10.2, <10.3
+    - cudnn>=7.6, <7.7
+    """
+        self.cuda_info = [(self.cuda90, "cuda9.0", ".post90"),
+                          (self.cuda100, "cuda10.0", ".post100"),
+                          (self.cuda101, "cuda10.1", ".post101"),
+                          (self.cuda102, "cuda10.2", "")]
+        self.py_str = ["py27", "py35", "py36", "py37", "py38"]
         self.pip_end = ".whl --no-deps"
         self.pip_prefix_linux = "pip install /package/paddlepaddle"
         self.pip_prefix_windows = r"pip install C:\package\paddlepaddle"
@@ -140,15 +149,18 @@ python setup.py install
         self.pip_cpu = "-"
         self.mac_pip = [
             "-cp27-cp27m-macosx_10_6_intel", "-cp35-cp35m-macosx_10_6_intel",
-            "-cp36-cp36m-macosx_10_6_intel", "-cp37-cp37m-macosx_10_6_intel"
+            "-cp36-cp36m-macosx_10_6_intel", "-cp37-cp37m-macosx_10_6_intel",
+            "-cp38-cp38-macosx_10_14_x86_64"
         ]
         self.linux_pip = [
             "-cp27-cp27mu-manylinux1_x86_64", "-cp35-cp35m-manylinux1_x86_64",
-            "-cp36-cp36m-manylinux1_x86_64", "-cp37-cp37m-manylinux1_x86_64"
+            "-cp36-cp36m-manylinux1_x86_64", "-cp37-cp37m-manylinux1_x86_64",
+            "-cp38-cp38-manylinux1_x86_64"
         ]
         self.windows_pip = [
             "-cp27-cp27m-win_amd64", "-cp35-cp35m-win_amd64",
-            "-cp36-cp36m-win_amd64", "-cp37-cp37m-win_amd64"
+            "-cp36-cp36m-win_amd64", "-cp37-cp37m-win_amd64",
+            "-cp38-cp38-win_amd64"
         ]
 
 
@@ -233,12 +245,6 @@ package:
         meta_str = meta_str + cuda_str
 
     blt_str = var.blt_const + blt_var
-    if (python_str == var.python27):
-        blt_str = blt_str + """
-    pip install C:\package\opencv_python-4.2.0.32-cp27-cp27m-win_amd64.whl"""
-    else:
-        meta_str = meta_str + """
-    - opencv>=3.4.2"""
 
     meta_str = meta_str + var.test + var.about
     meta_filename = "meta.yaml"
-- 
GitLab