From 52e6010ed1f671a3ff0f7b7e0633c458018c7ae5 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 28 Apr 2020 19:16:30 +0800 Subject: [PATCH] code reformat --- {dataset => fleetrec/dataset}/__init__.py | 0 {demo => fleetrec/demo}/__init__.py | 0 {demo => fleetrec/demo}/ctr-dnn_train.yaml | 0 {demo => fleetrec/demo}/user_define_trainer.py | 0 {doc => fleetrec/doc}/__init__.py | 0 {models => fleetrec/models}/__init__.py | 0 {models => fleetrec/models}/ctr/__init__.py | 0 {models => fleetrec/models}/ctr/criteo_reader.py | 0 {models => fleetrec/models}/ctr/deepfm/__init__.py | 0 {models => fleetrec/models}/ctr/dnn/__init__.py | 0 .../models}/ctr/dnn/data/test/sample_test.txt | 0 .../models}/ctr/dnn/data/train/sample_train.txt | 0 .../models}/ctr/dnn/hyper_parameters.yaml | 0 {models => fleetrec/models}/ctr/dnn/model.py | 0 {models => fleetrec/models}/multi_task/__init__.py | 0 {models => fleetrec/models}/other/__init__.py | 0 {models => fleetrec/models}/recall/__init__.py | 0 .../models}/recall/word2vec/hyper_parameters.yaml | 0 .../models}/recall/word2vec/model.py | 0 .../models}/recall/word2vec/reader.py | 0 .../models}/recall/word2vec/sample_test.txt | 0 .../models}/recall/word2vec/sample_train.txt | 0 {models => fleetrec/models}/tdm/__init__.py | 0 {tests => fleetrec/tests}/__init__.py | 0 {tools => fleetrec/tools}/__init__.py | 0 setup.py | 13 +------------ 26 files changed, 1 insertion(+), 12 deletions(-) rename {dataset => fleetrec/dataset}/__init__.py (100%) rename {demo => fleetrec/demo}/__init__.py (100%) rename {demo => fleetrec/demo}/ctr-dnn_train.yaml (100%) rename {demo => fleetrec/demo}/user_define_trainer.py (100%) rename {doc => fleetrec/doc}/__init__.py (100%) rename {models => fleetrec/models}/__init__.py (100%) rename {models => fleetrec/models}/ctr/__init__.py (100%) rename {models => fleetrec/models}/ctr/criteo_reader.py (100%) rename {models => fleetrec/models}/ctr/deepfm/__init__.py (100%) rename {models => fleetrec/models}/ctr/dnn/__init__.py (100%) rename {models => fleetrec/models}/ctr/dnn/data/test/sample_test.txt (100%) rename {models => fleetrec/models}/ctr/dnn/data/train/sample_train.txt (100%) rename {models => fleetrec/models}/ctr/dnn/hyper_parameters.yaml (100%) rename {models => fleetrec/models}/ctr/dnn/model.py (100%) rename {models => fleetrec/models}/multi_task/__init__.py (100%) rename {models => fleetrec/models}/other/__init__.py (100%) rename {models => fleetrec/models}/recall/__init__.py (100%) rename {models => fleetrec/models}/recall/word2vec/hyper_parameters.yaml (100%) rename {models => fleetrec/models}/recall/word2vec/model.py (100%) rename {models => fleetrec/models}/recall/word2vec/reader.py (100%) rename {models => fleetrec/models}/recall/word2vec/sample_test.txt (100%) rename {models => fleetrec/models}/recall/word2vec/sample_train.txt (100%) rename {models => fleetrec/models}/tdm/__init__.py (100%) rename {tests => fleetrec/tests}/__init__.py (100%) rename {tools => fleetrec/tools}/__init__.py (100%) diff --git a/dataset/__init__.py b/fleetrec/dataset/__init__.py similarity index 100% rename from dataset/__init__.py rename to fleetrec/dataset/__init__.py diff --git a/demo/__init__.py b/fleetrec/demo/__init__.py similarity index 100% rename from demo/__init__.py rename to fleetrec/demo/__init__.py diff --git a/demo/ctr-dnn_train.yaml b/fleetrec/demo/ctr-dnn_train.yaml similarity index 100% rename from demo/ctr-dnn_train.yaml rename to fleetrec/demo/ctr-dnn_train.yaml diff --git a/demo/user_define_trainer.py b/fleetrec/demo/user_define_trainer.py similarity index 100% rename from demo/user_define_trainer.py rename to fleetrec/demo/user_define_trainer.py diff --git a/doc/__init__.py b/fleetrec/doc/__init__.py similarity index 100% rename from doc/__init__.py rename to fleetrec/doc/__init__.py diff --git a/models/__init__.py b/fleetrec/models/__init__.py similarity index 100% rename from models/__init__.py rename to fleetrec/models/__init__.py diff --git a/models/ctr/__init__.py b/fleetrec/models/ctr/__init__.py similarity index 100% rename from models/ctr/__init__.py rename to fleetrec/models/ctr/__init__.py diff --git a/models/ctr/criteo_reader.py b/fleetrec/models/ctr/criteo_reader.py similarity index 100% rename from models/ctr/criteo_reader.py rename to fleetrec/models/ctr/criteo_reader.py diff --git a/models/ctr/deepfm/__init__.py b/fleetrec/models/ctr/deepfm/__init__.py similarity index 100% rename from models/ctr/deepfm/__init__.py rename to fleetrec/models/ctr/deepfm/__init__.py diff --git a/models/ctr/dnn/__init__.py b/fleetrec/models/ctr/dnn/__init__.py similarity index 100% rename from models/ctr/dnn/__init__.py rename to fleetrec/models/ctr/dnn/__init__.py diff --git a/models/ctr/dnn/data/test/sample_test.txt b/fleetrec/models/ctr/dnn/data/test/sample_test.txt similarity index 100% rename from models/ctr/dnn/data/test/sample_test.txt rename to fleetrec/models/ctr/dnn/data/test/sample_test.txt diff --git a/models/ctr/dnn/data/train/sample_train.txt b/fleetrec/models/ctr/dnn/data/train/sample_train.txt similarity index 100% rename from models/ctr/dnn/data/train/sample_train.txt rename to fleetrec/models/ctr/dnn/data/train/sample_train.txt diff --git a/models/ctr/dnn/hyper_parameters.yaml b/fleetrec/models/ctr/dnn/hyper_parameters.yaml similarity index 100% rename from models/ctr/dnn/hyper_parameters.yaml rename to fleetrec/models/ctr/dnn/hyper_parameters.yaml diff --git a/models/ctr/dnn/model.py b/fleetrec/models/ctr/dnn/model.py similarity index 100% rename from models/ctr/dnn/model.py rename to fleetrec/models/ctr/dnn/model.py diff --git a/models/multi_task/__init__.py b/fleetrec/models/multi_task/__init__.py similarity index 100% rename from models/multi_task/__init__.py rename to fleetrec/models/multi_task/__init__.py diff --git a/models/other/__init__.py b/fleetrec/models/other/__init__.py similarity index 100% rename from models/other/__init__.py rename to fleetrec/models/other/__init__.py diff --git a/models/recall/__init__.py b/fleetrec/models/recall/__init__.py similarity index 100% rename from models/recall/__init__.py rename to fleetrec/models/recall/__init__.py diff --git a/models/recall/word2vec/hyper_parameters.yaml b/fleetrec/models/recall/word2vec/hyper_parameters.yaml similarity index 100% rename from models/recall/word2vec/hyper_parameters.yaml rename to fleetrec/models/recall/word2vec/hyper_parameters.yaml diff --git a/models/recall/word2vec/model.py b/fleetrec/models/recall/word2vec/model.py similarity index 100% rename from models/recall/word2vec/model.py rename to fleetrec/models/recall/word2vec/model.py diff --git a/models/recall/word2vec/reader.py b/fleetrec/models/recall/word2vec/reader.py similarity index 100% rename from models/recall/word2vec/reader.py rename to fleetrec/models/recall/word2vec/reader.py diff --git a/models/recall/word2vec/sample_test.txt b/fleetrec/models/recall/word2vec/sample_test.txt similarity index 100% rename from models/recall/word2vec/sample_test.txt rename to fleetrec/models/recall/word2vec/sample_test.txt diff --git a/models/recall/word2vec/sample_train.txt b/fleetrec/models/recall/word2vec/sample_train.txt similarity index 100% rename from models/recall/word2vec/sample_train.txt rename to fleetrec/models/recall/word2vec/sample_train.txt diff --git a/models/tdm/__init__.py b/fleetrec/models/tdm/__init__.py similarity index 100% rename from models/tdm/__init__.py rename to fleetrec/models/tdm/__init__.py diff --git a/tests/__init__.py b/fleetrec/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to fleetrec/tests/__init__.py diff --git a/tools/__init__.py b/fleetrec/tools/__init__.py similarity index 100% rename from tools/__init__.py rename to fleetrec/tools/__init__.py diff --git a/setup.py b/setup.py index e9cf1d0e..1d6fabbd 100644 --- a/setup.py +++ b/setup.py @@ -4,17 +4,6 @@ setup for fleet-rec. from setuptools import setup, find_packages -models = find_packages("models") -tools = find_packages("tools") -dataset = find_packages("dataset") -core = find_packages("fleetrec") - -package_dir = {} -package_dir["fleetrec.models"] = models -package_dir["fleetrec.tools"] = tools -package_dir["fleetrec.dataset"] = dataset -package_dir["fleetrec"] = core - requires = [ "paddlepaddle >= 0.0.0", "netron >= 0.0.0" @@ -38,7 +27,7 @@ setup( author=about["__author__"], author_email=about["__author_email__"], url=about["__url__"], - package_dir=package_dir, + packages=find_packages("fleetrec"), python_requires=">=2.7", install_requires=requires, zip_safe=False -- GitLab