divide directory

m3dev · Sep 19, 2021 · a4bf46e · a4bf46e
1 parent aabe54c
commit a4bf46e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/redshells/contrib/train/__init__.py b/redshells/contrib/train/__init__.py
@@ -1,3 +1,4 @@
+from redshells.contrib.train.train_feature_aggregation_similarity_model import TrainFeatureAggregationSimilarityModel
 from redshells.contrib.train.train_graph_convolutional_matrix_completion import TrainGraphConvolutionalMatrixCompletion
 from redshells.contrib.train.train_matrix_factorization import TrainMatrixFactorization
 import redshells.train.utils
diff --git a/...n_feature_aggregation_similarity_model.py → ...n_feature_aggregation_similarity_model.py b/...n_feature_aggregation_similarity_model.py → ...n_feature_aggregation_similarity_model.py
@@ -5,8 +5,8 @@
 
 import gokart
 
-from redshells.model import FeatureAggregationSimilarityModel
-from redshells.model.feature_aggregation_similarity_model import FeatureAggregationSimilarityDataset
+from redshells.contrib.model import FeatureAggregationSimilarityModel
+from redshells.contrib.model.feature_aggregation_similarity_model import FeatureAggregationSimilarityDataset
 
 logger = getLogger(__name__)
 

diff --git a/redshells/contrib/train/train_graph_convolutional_matrix_completion.py b/redshells/contrib/train/train_graph_convolutional_matrix_completion.py
@@ -5,8 +5,8 @@
 import sklearn
 
 import gokart
-from redshells.model.contrib.gcmc_dataset import GcmcDataset, GcmcGraphDataset
-from redshells.model.contrib.graph_convolutional_matrix_completion import GraphConvolutionalMatrixCompletion
+from redshells.contrib.model.gcmc_dataset import GcmcDataset, GcmcGraphDataset
+from redshells.contrib.model.graph_convolutional_matrix_completion import GraphConvolutionalMatrixCompletion
 
 logger = getLogger(__name__)
 

diff --git a/redshells/train/__init__.py b/redshells/train/__init__.py
@@ -5,7 +5,6 @@
 from redshells.train.train_doc2vec import TrainDoc2Vec
 from redshells.train.train_factorization_machine import TrainFactorizationMachine
 from redshells.train.train_fasttext import TrainFastText
-from redshells.train.train_feature_aggregation_similarity_model import TrainFeatureAggregationSimilarityModel
 from redshells.train.train_lda_model import TrainLdaModel
 from redshells.train.train_pairwise_similarity_model import TrainPairwiseSimilarityModel
 from redshells.train.train_tfidf import TrainTfidf

diff --git a/redshells/train/train_fasttext.py b/redshells/train/train_fasttext.py
@@ -6,7 +6,7 @@
 import luigi
 
 import gokart
-import redshells
+from redshells.train.utils import TokenIterator
 
 logger = getLogger(__name__)
 
@@ -31,7 +31,7 @@ def run(self):
         shuffle(texts)
 
         if isinstance(texts[0], str):
-            texts = redshells.train.utils.TokenIterator(texts=texts)
+            texts = TokenIterator(texts=texts)
 
         logger.info(f'training FastText...')
         model = gensim.models.FastText(sentences=texts, **self.fasttext_kwargs)

diff --git a/...t_feature_aggregation_similarity_model.py → ...t_feature_aggregation_similarity_model.py b/...t_feature_aggregation_similarity_model.py → ...t_feature_aggregation_similarity_model.py
@@ -3,8 +3,8 @@
 
 import numpy as np
 
-from redshells.model import FeatureAggregationSimilarityModel
-from redshells.model.feature_aggregation_similarity_model import FeatureAggregationSimilarityDataset
+from redshells.contrib.model import FeatureAggregationSimilarityModel
+from redshells.contrib.model.feature_aggregation_similarity_model import FeatureAggregationSimilarityDataset
 
 logger = getLogger(__name__)
 

diff --git a/...n_feature_aggregation_similarity_model.py → ...n_feature_aggregation_similarity_model.py b/...n_feature_aggregation_similarity_model.py → ...n_feature_aggregation_similarity_model.py
@@ -6,9 +6,9 @@
 
 import gokart
 
-from redshells.model import FeatureAggregationSimilarityModel
-from redshells.model.feature_aggregation_similarity_model import FeatureAggregationSimilarityDataset
-from redshells.train import TrainFeatureAggregationSimilarityModel
+from redshells.contrib.model import FeatureAggregationSimilarityModel
+from redshells.contrib.model.feature_aggregation_similarity_model import FeatureAggregationSimilarityDataset
+from redshells.contrib.train import TrainFeatureAggregationSimilarityModel
 
 logger = getLogger(__name__)