diff --git a/core/engine/cluster/cluster.py b/core/engine/cluster/cluster.py index 3ce6bf66cd64a387aca4f81437f48ded37970098..6dfcec3a929ad8124192014f48270ebd1862dc2c 100644 --- a/core/engine/cluster/cluster.py +++ b/core/engine/cluster/cluster.py @@ -15,9 +15,9 @@ from __future__ import print_function from __future__ import unicode_literals -import subprocess -import os import copy +import os +import subprocess from paddlerec.core.engine.engine import Engine from paddlerec.core.factory import TrainerFactory diff --git a/core/engine/local_cluster.py b/core/engine/local_cluster.py index 72d440a825874b7334502cf3cab6ba6dd2ef4215..a0e4cf18f38c293823cbe14d1547d2d876ce94f9 100755 --- a/core/engine/local_cluster.py +++ b/core/engine/local_cluster.py @@ -14,10 +14,12 @@ from __future__ import print_function from __future__ import unicode_literals -import subprocess -import sys -import os + import copy +import os +import sys +import subprocess + from paddlerec.core.engine.engine import Engine from paddlerec.core.utils import envs diff --git a/core/engine/local_mpi.py b/core/engine/local_mpi.py index 1f7a27a849e8629c56c1cf26d90b116569517454..49db821fe5764ae9ef7f42cbd3ca2fe77b83a1d1 100755 --- a/core/engine/local_mpi.py +++ b/core/engine/local_mpi.py @@ -14,10 +14,11 @@ from __future__ import print_function from __future__ import unicode_literals -import subprocess -import sys -import os + import copy +import os +import sys +import subprocess from paddlerec.core.engine.engine import Engine diff --git a/core/metrics/auc_metrics.py b/core/metrics/auc_metrics.py index 3c48040db29fc31846780f6f4e871168ac65f3f8..ece46a4d6ca9399b02830aae7d9f990f4a6d2d9f 100755 --- a/core/metrics/auc_metrics.py +++ b/core/metrics/auc_metrics.py @@ -13,8 +13,10 @@ # limitations under the License. import math + import numpy as np import paddle.fluid as fluid + from paddlerec.core.metric import Metric diff --git a/core/model.py b/core/model.py index fbafc69560e0768fd7a5f73b684d9bd6cbfbc4f9..c51ba2417da7d6d7530f29c2b0bc9f5090d810ea 100755 --- a/core/model.py +++ b/core/model.py @@ -15,6 +15,7 @@ import abc import paddle.fluid as fluid + from paddlerec.core.utils import envs diff --git a/core/modules/modul/build.py b/core/modules/modul/build.py index fe065678713d777519b8bbfd909a7c4c16f72439..0263cbf60e3b1647a05cbc471b7bbff1840f88ba 100755 --- a/core/modules/modul/build.py +++ b/core/modules/modul/build.py @@ -12,10 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import yaml import copy + import paddle.fluid as fluid from paddle.fluid.incubate.fleet.parameter_server.pslib import fleet +import yaml from paddlerec.core.model import Model from paddlerec.core.utils import table diff --git a/core/modules/modul/layers.py b/core/modules/modul/layers.py index f533a46db24da5e6feb3e8723ff3265529cfbcb3..c582798081e366aba1377caade1032958ae2b91a 100755 --- a/core/modules/modul/layers.py +++ b/core/modules/modul/layers.py @@ -13,6 +13,7 @@ # limitations under the License. import paddle.fluid as fluid + from paddlerec.core.layer import Layer diff --git a/core/trainer.py b/core/trainer.py index df5626b7a5317b9fd7f108964adf11afe0c59c0e..40fc35de973ce7841bfdf28dfc6c6a3751484be7 100755 --- a/core/trainer.py +++ b/core/trainer.py @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os -import sys - import abc +import os import time +import sys import yaml from paddle import fluid + from paddlerec.core.utils import envs diff --git a/core/trainers/ctr_coding_trainer.py b/core/trainers/ctr_coding_trainer.py index a6377c853853d3f1ab53c55b9a5253cf0ff8d5b7..e6979a922618c4ea118da26c1a08e6808276e482 100755 --- a/core/trainers/ctr_coding_trainer.py +++ b/core/trainers/ctr_coding_trainer.py @@ -11,9 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import os -import numpy as np +import numpy as np import paddle.fluid as fluid from paddle.fluid.incubate.fleet.parameter_server.pslib import fleet from paddle.fluid.incubate.fleet.base.role_maker import MPISymetricRoleMaker diff --git a/core/trainers/ctr_modul_trainer.py b/core/trainers/ctr_modul_trainer.py index 8c99a5c885ed1b8a577556c52d56c4a8ad04944c..d486767e300ce9d8ce6f56b4fb6b9820779e2df6 100755 --- a/core/trainers/ctr_modul_trainer.py +++ b/core/trainers/ctr_modul_trainer.py @@ -13,12 +13,12 @@ # limitations under the License. +import datetime +import json import sys import time -import json -import datetime -import numpy as np +import numpy as np import paddle.fluid as fluid from paddle.fluid.incubate.fleet.parameter_server.pslib import fleet from paddle.fluid.incubate.fleet.base.role_maker import GeneralRoleMaker diff --git a/core/trainers/online_learning_trainer.py b/core/trainers/online_learning_trainer.py index 1924b966dd2ba34c4ca10e21471b39b4d3e793ab..4a64d4c278859071019d0932d96015210402e12e 100755 --- a/core/trainers/online_learning_trainer.py +++ b/core/trainers/online_learning_trainer.py @@ -18,9 +18,9 @@ Training use fluid with one node only. from __future__ import print_function +import datetime import os import time -import datetime import paddle.fluid as fluid from paddle.fluid.incubate.fleet.parameter_server.distribute_transpiler import fleet diff --git a/core/trainers/single_trainer.py b/core/trainers/single_trainer.py index 888a93f3ddb7c1045505fc98eebc15d6dd19e950..e2f02f4bd76ae7c2c6f6a3be5744f70828b8a8e7 100755 --- a/core/trainers/single_trainer.py +++ b/core/trainers/single_trainer.py @@ -17,14 +17,14 @@ Training use fluid with one node only. """ from __future__ import print_function -import logging + import time +import logging import paddle.fluid as fluid from paddlerec.core.trainers.transpiler_trainer import TranspileTrainer from paddlerec.core.utils import envs -import numpy as np logging.basicConfig(format="%(asctime)s - %(levelname)s - %(message)s") logger = logging.getLogger("fluid") diff --git a/core/trainers/tdm_cluster_trainer.py b/core/trainers/tdm_cluster_trainer.py index 60e87bfdad5b8a68151f9e8ec489be0c91bee1e6..1ce2dfc9acc511e5ca946dba584eaeae5f905f07 100755 --- a/core/trainers/tdm_cluster_trainer.py +++ b/core/trainers/tdm_cluster_trainer.py @@ -17,7 +17,9 @@ Training use fluid with one node only. """ from __future__ import print_function + import logging + import numpy as np import paddle.fluid as fluid from paddle.fluid.incubate.fleet.parameter_server.distribute_transpiler import fleet diff --git a/core/trainers/tdm_single_trainer.py b/core/trainers/tdm_single_trainer.py index 8890ffd70372a4b7f09de84ad1e3f25c3c6ad866..1e7700f34207694718cc7b781e8bdead6aba85e2 100755 --- a/core/trainers/tdm_single_trainer.py +++ b/core/trainers/tdm_single_trainer.py @@ -18,11 +18,12 @@ Training use fluid with one node only. from __future__ import print_function import logging -import paddle.fluid as fluid +import numpy as np +import paddle.fluid as fluid from paddlerec.core.trainers.single_trainer import SingleTrainer from paddlerec.core.utils import envs -import numpy as np + logging.basicConfig(format="%(asctime)s - %(levelname)s - %(message)s") logger = logging.getLogger("fluid") diff --git a/core/utils/dataset.py b/core/utils/dataset.py index 0eff8da071920b9931ce073ff94abe253baa31a0..c02fb3d3cb3685cf8b00025931c77d118177ff32 100755 --- a/core/utils/dataset.py +++ b/core/utils/dataset.py @@ -13,8 +13,8 @@ # limitations under the License. import abc -import time import datetime +import time import paddle.fluid as fluid diff --git a/core/utils/dataset_instance.py b/core/utils/dataset_instance.py index 94997b669a5579cae4a403422c92fe277fa046b6..731b3b47169d9e67735953c8488469d4d60cb296 100755 --- a/core/utils/dataset_instance.py +++ b/core/utils/dataset_instance.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function import sys diff --git a/core/utils/envs.py b/core/utils/envs.py index 084cec0b9a20a74d5f0c1d35e98ab0c97a158e59..4fe57b32a6a534c630005d42e66b1aedc7972089 100755 --- a/core/utils/envs.py +++ b/core/utils/envs.py @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os +from contextlib import closing import copy -import sys +import os import socket -from contextlib import closing +import sys global_envs = {} diff --git a/core/utils/fs.py b/core/utils/fs.py index df2379721041197170945ebfd03ccf8f8cc61d0a..a1f5a843f635af93a2b43ee22fd354b8436ec968 100755 --- a/core/utils/fs.py +++ b/core/utils/fs.py @@ -13,6 +13,7 @@ # limitations under the License. import os + from paddle.fluid.incubate.fleet.utils.hdfs import HDFSClient diff --git a/core/utils/util.py b/core/utils/util.py index 76965f50ccf298dd63bd67e1c74d4f3d23c2fe72..bd63284873b6c6be80c9849f40535cebe1b7fb14 100755 --- a/core/utils/util.py +++ b/core/utils/util.py @@ -12,11 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +import datetime import os import time -import datetime from paddle import fluid + from paddlerec.core.utils import fs as fs diff --git a/models/contentunderstanding/classification/model.py b/models/contentunderstanding/classification/model.py index 46869b44a5ae2671f31d75b6ac798ce5f4388fdc..18db63a5591340e2137d8a1af3e74d73f2fe0f52 100644 --- a/models/contentunderstanding/classification/model.py +++ b/models/contentunderstanding/classification/model.py @@ -12,11 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +import paddle.fluid as fluid from paddlerec.core.model import Model as ModelBase -import paddle.fluid as fluid - class Model(ModelBase): def __init__(self, config): diff --git a/models/contentunderstanding/classification/reader.py b/models/contentunderstanding/classification/reader.py index 8c3f54863197df5b4b721ed9e4c80855990bbdfc..72b1837ab359df6888e02b6ca1084b73156c4dee 100644 --- a/models/contentunderstanding/classification/reader.py +++ b/models/contentunderstanding/classification/reader.py @@ -15,9 +15,9 @@ import sys - from paddlerec.core.reader import Reader + class TrainReader(Reader): def init(self): pass diff --git a/models/contentunderstanding/tagspace/model.py b/models/contentunderstanding/tagspace/model.py index 7ed1fcf370fc82a9f36798d2700bdb072b1e9309..eb01efbab1295829a939bfa8607bbe4c7418e37f 100644 --- a/models/contentunderstanding/tagspace/model.py +++ b/models/contentunderstanding/tagspace/model.py @@ -12,13 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -from paddlerec.core.model import Model as ModelBase - import paddle.fluid as fluid import paddle.fluid.layers.nn as nn import paddle.fluid.layers.tensor as tensor import paddle.fluid.layers.control_flow as cf +from paddlerec.core.model import Model as ModelBase + + class Model(ModelBase): def __init__(self, config): ModelBase.__init__(self, config) diff --git a/models/contentunderstanding/tagspace/reader.py b/models/contentunderstanding/tagspace/reader.py index 8c912a68b852cc183414406aa7d1786955d2741b..596a9a13a613f4a940a77b5292c59781e62c2f55 100644 --- a/models/contentunderstanding/tagspace/reader.py +++ b/models/contentunderstanding/tagspace/reader.py @@ -14,10 +14,10 @@ import sys + import numpy as np from paddlerec.core.reader import Reader -from paddlerec.core.utils import envs class TrainReader(Reader): def init(self): diff --git a/models/match/dssm/synthetic_reader.py b/models/match/dssm/synthetic_reader.py index cc829374435ea560d2d23bfab2386ca29c957c2d..25c2e43b839fa45188facd27a53a9e413e7f26a8 100755 --- a/models/match/dssm/synthetic_reader.py +++ b/models/match/dssm/synthetic_reader.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function from paddlerec.core.reader import Reader diff --git a/models/multitask/esmm/esmm_infer_reader.py b/models/multitask/esmm/esmm_infer_reader.py index 6e94a1eed07bab82fa80ece0041f9b1e94bb531d..416c7a671aa0757d02f8de4957b8e6c2e8212fff 100644 --- a/models/multitask/esmm/esmm_infer_reader.py +++ b/models/multitask/esmm/esmm_infer_reader.py @@ -13,10 +13,10 @@ # limitations under the License. from __future__ import print_function -from paddlerec.core.reader import Reader -from paddlerec.core.utils import envs from collections import defaultdict -import numpy as np + +from paddlerec.core.reader import Reader + class EvaluateReader(Reader): diff --git a/models/multitask/esmm/esmm_reader.py b/models/multitask/esmm/esmm_reader.py index f7aef643cd3db5c01c1cc3a632a99fa3fa342658..b0bed00fb8499472e1ea463068ab2d0c718c769a 100644 --- a/models/multitask/esmm/esmm_reader.py +++ b/models/multitask/esmm/esmm_reader.py @@ -11,12 +11,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function -from paddlerec.core.reader import Reader -from paddlerec.core.utils import envs from collections import defaultdict -import numpy as np + +from paddlerec.core.reader import Reader class TrainReader(Reader): diff --git a/models/multitask/esmm/model.py b/models/multitask/esmm/model.py index 1641f72d1e4eab39cfe7ce1aa5055c25d139fb16..dc68f7cf26b83b8424daaf4f604e8f301564bce8 100644 --- a/models/multitask/esmm/model.py +++ b/models/multitask/esmm/model.py @@ -12,12 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import math +import numpy as np import paddle.fluid as fluid from paddlerec.core.utils import envs from paddlerec.core.model import Model as ModelBase -import numpy as np class Model(ModelBase): diff --git a/models/multitask/mmoe/census_infer_reader.py b/models/multitask/mmoe/census_infer_reader.py index c25ccea8c4416bbfe64d3cdda59f5ee13b0cfac1..c62de8e69ce6ccfbb4df1e1252d9630a84fc56b3 100644 --- a/models/multitask/mmoe/census_infer_reader.py +++ b/models/multitask/mmoe/census_infer_reader.py @@ -11,11 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function from paddlerec.core.reader import Reader -from paddlerec.core.utils import envs -import numpy as np class EvaluateReader(Reader): diff --git a/models/multitask/mmoe/census_reader.py b/models/multitask/mmoe/census_reader.py index 30997c632302c2a6e963099c9e2679978c9d9b61..abe6ba9a88c1cb0d7216c2facf8c2f4cf379577b 100644 --- a/models/multitask/mmoe/census_reader.py +++ b/models/multitask/mmoe/census_reader.py @@ -11,11 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function from paddlerec.core.reader import Reader -from paddlerec.core.utils import envs -import numpy as np class TrainReader(Reader): diff --git a/models/multitask/mmoe/model.py b/models/multitask/mmoe/model.py index 753bacae77f089dc709e34812ef109ac06aebcfb..7f54dda49703e8f2fe03ed69ff2e47143849e49d 100644 --- a/models/multitask/mmoe/model.py +++ b/models/multitask/mmoe/model.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import math import paddle.fluid as fluid from paddlerec.core.utils import envs diff --git a/models/multitask/share-bottom/census_infer_reader.py b/models/multitask/share-bottom/census_infer_reader.py index d4071a1bcdd6232a40fc006523b7bea7c5735de0..c62de8e69ce6ccfbb4df1e1252d9630a84fc56b3 100644 --- a/models/multitask/share-bottom/census_infer_reader.py +++ b/models/multitask/share-bottom/census_infer_reader.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function from paddlerec.core.reader import Reader diff --git a/models/rank/criteo_reader.py b/models/rank/criteo_reader.py index 3d8fcf96a4be04f60fb9928e4db2190b306813ff..75994fb43f6ee3a72ab2aae25c36e0591c530fee 100755 --- a/models/rank/criteo_reader.py +++ b/models/rank/criteo_reader.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function from paddlerec.core.reader import Reader diff --git a/models/rank/dcn/criteo_reader.py b/models/rank/dcn/criteo_reader.py index 5c180ee21f55cc651aba52323cf876b3d67b2c77..fde9e8822ac62582807a30a15914653c22eab9e7 100755 --- a/models/rank/dcn/criteo_reader.py +++ b/models/rank/dcn/criteo_reader.py @@ -11,16 +11,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function import math +import os -from paddlerec.core.reader import Reader -from paddlerec.core.utils import envs try: import cPickle as pickle except ImportError: import pickle -import os + + +from paddlerec.core.reader import Reader +from paddlerec.core.utils import envs + class TrainReader(Reader): def init(self): diff --git a/models/rank/dcn/model.py b/models/rank/dcn/model.py index d9292492e24aee257f271f7bee9e0abaee69806a..c34939aecae6391b70f4fd48af001598d5c90af4 100755 --- a/models/rank/dcn/model.py +++ b/models/rank/dcn/model.py @@ -12,11 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +from collections import OrderedDict + import paddle.fluid as fluid from paddlerec.core.utils import envs from paddlerec.core.model import Model as ModelBase -from collections import OrderedDict + class Model(ModelBase): def __init__(self, config): diff --git a/models/rank/deepfm/criteo_reader.py b/models/rank/deepfm/criteo_reader.py index ae942e0a82eec7d90b0dab618310dc900985a4ee..87692ff9cc7c462eae77c5534fb990941fe53666 100755 --- a/models/rank/deepfm/criteo_reader.py +++ b/models/rank/deepfm/criteo_reader.py @@ -11,15 +11,18 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function -from paddlerec.core.reader import Reader -from paddlerec.core.utils import envs try: import cPickle as pickle except ImportError: import pickle +from paddlerec.core.reader import Reader +from paddlerec.core.utils import envs + + class TrainReader(Reader): def init(self): self.cont_min_ = [0, -3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] diff --git a/models/rank/deepfm/model.py b/models/rank/deepfm/model.py index 8636078d87e65eb3c7acacf528e0592d10506a45..ea24696847c9a656e3593f9da791cde1593d0061 100755 --- a/models/rank/deepfm/model.py +++ b/models/rank/deepfm/model.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle.fluid as fluid import math +import paddle.fluid as fluid + from paddlerec.core.utils import envs from paddlerec.core.model import Model as ModelBase diff --git a/models/rank/din/reader.py b/models/rank/din/reader.py index d1742bddd8bbb5b98bdecaad0f43f438701cc480..44fa4a7c9b3d52fb371cc1ab1693a5d350e2bf6d 100755 --- a/models/rank/din/reader.py +++ b/models/rank/din/reader.py @@ -13,16 +13,20 @@ # limitations under the License. from __future__ import print_function -from paddlerec.core.reader import Reader -from paddlerec.core.utils import envs -import numpy as np import os import random + try: import cPickle as pickle except ImportError: import pickle +import numpy as np + +from paddlerec.core.reader import Reader +from paddlerec.core.utils import envs + + class TrainReader(Reader): def init(self): self.train_data_path = envs.get_global_env("train_data_path", None, "train.reader") diff --git a/models/rank/dnn/model.py b/models/rank/dnn/model.py index 7a5ed0d421d851852bbe80ae9461c4dc6bbc6627..67bf61a04f0e93067f7a23fa3699ad08e6ce137f 100755 --- a/models/rank/dnn/model.py +++ b/models/rank/dnn/model.py @@ -13,6 +13,7 @@ # limitations under the License. import math + import paddle.fluid as fluid from paddlerec.core.utils import envs diff --git a/models/rank/wide_deep/model.py b/models/rank/wide_deep/model.py index 8e39cafc5f59a9c21486f826566dcda3951ec51a..a74bde09e83fa856f79a45e72bb7860addddccd4 100755 --- a/models/rank/wide_deep/model.py +++ b/models/rank/wide_deep/model.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import paddle.fluid as fluid import math +import paddle.fluid as fluid + from paddlerec.core.utils import envs from paddlerec.core.model import Model as ModelBase diff --git a/models/rank/wide_deep/reader.py b/models/rank/wide_deep/reader.py index f2a1058f018c31dfc45700fdc60be2150ffcfa01..633dce6e5851e531a8b6f7c0df8d3bb502e5afef 100755 --- a/models/rank/wide_deep/reader.py +++ b/models/rank/wide_deep/reader.py @@ -11,14 +11,17 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function -from paddlerec.core.reader import Reader try: import cPickle as pickle except ImportError: import pickle +from paddlerec.core.reader import Reader + + class TrainReader(Reader): def init(self): pass diff --git a/models/rank/xdeepfm/criteo_reader.py b/models/rank/xdeepfm/criteo_reader.py index 237d7d6d72eb422ead7727b5438050101623f91a..6bf3290fdad2b6aae93de3a339acb081e8f15e23 100755 --- a/models/rank/xdeepfm/criteo_reader.py +++ b/models/rank/xdeepfm/criteo_reader.py @@ -11,14 +11,17 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function -from paddlerec.core.reader import Reader try: import cPickle as pickle except ImportError: import pickle +from paddlerec.core.reader import Reader + + class TrainReader(Reader): def init(self): pass diff --git a/models/recall/gnn/evaluate_reader.py b/models/recall/gnn/evaluate_reader.py index 4ced177e3fdb336b7f643b5a0d8f63b7e0aa5d0e..fa28fa6374e06d2f2f83d3f8a12153ef58499103 100755 --- a/models/recall/gnn/evaluate_reader.py +++ b/models/recall/gnn/evaluate_reader.py @@ -12,9 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np import copy import random + +import numpy as np + from paddlerec.core.reader import Reader from paddlerec.core.utils import envs diff --git a/models/recall/gnn/model.py b/models/recall/gnn/model.py index ac628ec6209e9489ac20550a7837b60c9e8e3771..1228e6b028552bc4e96ac8ce80fecb329da1eabc 100755 --- a/models/recall/gnn/model.py +++ b/models/recall/gnn/model.py @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np import math +import numpy as np + import paddle.fluid as fluid import paddle.fluid.layers as layers diff --git a/models/recall/gnn/reader.py b/models/recall/gnn/reader.py index d9aab524e10f62601adea8472fe1ebd0915b7770..ad6f63ddcc7166f132f151b19f6e5708d65ccace 100755 --- a/models/recall/gnn/reader.py +++ b/models/recall/gnn/reader.py @@ -12,9 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np import copy import random + +import numpy as np + from paddlerec.core.reader import Reader from paddlerec.core.utils import envs diff --git a/models/recall/gru4rec/rsc15_infer_reader.py b/models/recall/gru4rec/rsc15_infer_reader.py index 4bde64cbf0bdb93a2863b9717c9509d993eb726a..b58532a471f4b70eedfebeeadb35df20b4c40e72 100644 --- a/models/recall/gru4rec/rsc15_infer_reader.py +++ b/models/recall/gru4rec/rsc15_infer_reader.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function from paddlerec.core.reader import Reader diff --git a/models/recall/gru4rec/rsc15_reader.py b/models/recall/gru4rec/rsc15_reader.py index 0abd6f41db693c3297d2ef89408e646f37ea9c70..4fe9433a65e1ceec508891eecfaaa5e464bc9e24 100644 --- a/models/recall/gru4rec/rsc15_reader.py +++ b/models/recall/gru4rec/rsc15_reader.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function from paddlerec.core.reader import Reader diff --git a/models/recall/ssr/model.py b/models/recall/ssr/model.py index e11e0cf1978713e00533da723c71a72d37abe734..ac986128c3b9d7e1331b74f4ab1753c588029c1f 100644 --- a/models/recall/ssr/model.py +++ b/models/recall/ssr/model.py @@ -13,12 +13,11 @@ # limitations under the License. import paddle.fluid as fluid - -from paddlerec.core.utils import envs -from paddlerec.core.model import Model as ModelBase import paddle.fluid.layers.tensor as tensor import paddle.fluid.layers.control_flow as cf +from paddlerec.core.utils import envs +from paddlerec.core.model import Model as ModelBase class BowEncoder(object): diff --git a/models/recall/ssr/ssr_infer_reader.py b/models/recall/ssr/ssr_infer_reader.py index 5a40280b101d8f7064b98346e1ec6c30ad1e2845..40e1bf6de78fb5a99f1e82a2efc6b59948d65a55 100644 --- a/models/recall/ssr/ssr_infer_reader.py +++ b/models/recall/ssr/ssr_infer_reader.py @@ -11,11 +11,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function +import numpy as np + from paddlerec.core.reader import Reader from paddlerec.core.utils import envs -import numpy as np + class EvaluateReader(Reader): diff --git a/models/recall/ssr/ssr_reader.py b/models/recall/ssr/ssr_reader.py index ba00457560b006ae30b619a769ca99bd26dfcc7a..12e8bfb20532c9bc83c5989aabb288878bd6a6bf 100644 --- a/models/recall/ssr/ssr_reader.py +++ b/models/recall/ssr/ssr_reader.py @@ -11,11 +11,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import print_function -from paddlerec.core.reader import Reader import random +from paddlerec.core.reader import Reader + + class TrainReader(Reader): def init(self): diff --git a/models/recall/word2vec/model.py b/models/recall/word2vec/model.py index ea8e0f5e81e5554668ba9ad81cc7f80718a0b3b9..bf09a04648a71a6618b99ef7de7d7244aaecbdba 100755 --- a/models/recall/word2vec/model.py +++ b/models/recall/word2vec/model.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import math import numpy as np import paddle.fluid as fluid diff --git a/models/recall/word2vec/preprocess.py b/models/recall/word2vec/preprocess.py index 592f9755b761cf3d98c91f982de18de403c74298..07d7b3457f54703010cb5b9732d4a0efa14ffd17 100755 --- a/models/recall/word2vec/preprocess.py +++ b/models/recall/word2vec/preprocess.py @@ -13,13 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. +import io +import math import os import random import re import six + + import argparse -import io -import math + + + prog = re.compile("[^a-z ]", flags=0) diff --git a/models/recall/word2vec/w2v_evaluate_reader.py b/models/recall/word2vec/w2v_evaluate_reader.py index 96d483dbf90f041fda2821b998d9f711d66cc2f8..548fbedd7876ee7ab18dfaf95f153e17a25270b8 100755 --- a/models/recall/word2vec/w2v_evaluate_reader.py +++ b/models/recall/word2vec/w2v_evaluate_reader.py @@ -11,8 +11,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import io + import six + from paddlerec.core.reader import Reader from paddlerec.core.utils import envs diff --git a/models/recall/word2vec/w2v_reader.py b/models/recall/word2vec/w2v_reader.py index 609a516a24ada32908f1748d6c4598be3d61accc..128e31e93ea50c39b61a62754cd0df42e6affd7c 100755 --- a/models/recall/word2vec/w2v_reader.py +++ b/models/recall/word2vec/w2v_reader.py @@ -11,8 +11,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import numpy as np + import io + +import numpy as np + from paddlerec.core.reader import Reader from paddlerec.core.utils import envs diff --git a/models/treebased/tdm/model.py b/models/treebased/tdm/model.py index 0fc1adf9cd04286cdb31cc3ba08715574dbee18b..3ce23eeca097babc00208eb76905493747f7b49d 100755 --- a/models/treebased/tdm/model.py +++ b/models/treebased/tdm/model.py @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. """ + import paddle.fluid as fluid -import math from paddlerec.core.utils import envs from paddlerec.core.model import Model as ModelBase diff --git a/run.py b/run.py index 6c0e06f77a644a1166ee8c318e057ade2d060643..56999935f21bc1de2b2bc7b4a080da023559174a 100755 --- a/run.py +++ b/run.py @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import argparse import os import subprocess -import tempfile +import argparse +import tempfile import yaml from paddlerec.core.factory import TrainerFactory diff --git a/setup.py b/setup.py index ab0c2792a25ad0df70857d22f4610479beb97bb5..a368bc3d1c3d75a0be6aa910c6d27198e6f3a3d3 100644 --- a/setup.py +++ b/setup.py @@ -15,10 +15,13 @@ """ setup for paddle-rec. """ + import os + from setuptools import setup, find_packages -import tempfile import shutil +import tempfile + requires = [ "paddlepaddle == 1.7.2", diff --git a/tools/tools.py b/tools/tools.py index ec85326cf71374aa4139a58ffc0cf05535543949..8508a790bc8012954b53cc43b088d2e50655647d 100644 --- a/tools/tools.py +++ b/tools/tools.py @@ -12,15 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +import functools import os -import time +import platform +import sys import shutil +import time + import requests -import sys import tarfile import zipfile -import platform -import functools lasttime = time.time() FLUSH_INTERVAL = 0.1