From d6d64fe870400faaedea6fab22347b8094c71fc6 Mon Sep 17 00:00:00 2001 From: Frozenmad Date: Sun, 27 Jun 2021 06:36:25 +0000 Subject: [PATCH] adjust imports --- autogl/datasets/__init__.py | 61 ++++++++++++++- autogl/module/__init__.py | 9 +++ autogl/module/feature/__init__.py | 78 ++++++++++++++++++-- autogl/module/feature/generators/__init__.py | 15 +++- autogl/module/feature/selectors/__init__.py | 2 - autogl/module/feature/subgraph/__init__.py | 43 ++++++++++- autogl/module/feature/subgraph/netlsd.py | 1 - autogl/module/feature/subgraph/nx.py | 4 - autogl/module/feature/subgraph/stats.py | 1 - autogl/module/model/__init__.py | 12 +++ autogl/module/nas/__init__.py | 12 ++- 11 files changed, 215 insertions(+), 23 deletions(-) delete mode 100644 autogl/module/feature/subgraph/stats.py diff --git a/autogl/datasets/__init__.py b/autogl/datasets/__init__.py index 6b6919a..363b5d1 100644 --- a/autogl/datasets/__init__.py +++ b/autogl/datasets/__init__.py @@ -136,10 +136,6 @@ __all__ = [ "register_dataset", "build_dataset", "build_dataset_from_name", - "GatneDataset", - "GTNDataset", - "HANDataset", - "MatlabMatrix", "get_label_number", "random_splits_mask", "random_splits_mask_class", @@ -147,4 +143,61 @@ __all__ = [ "graph_set_fold_id", "graph_random_splits", "graph_get_split", + "AmazonComputersDataset", + "AmazonPhotoDataset", + "CoauthorPhysicsDataset", + "CoauthorCSDataset", + "CoraDataset", + "CiteSeerDataset", + "PubMedDataset", + "RedditDataset", + "MUTAGDataset", + "IMDBBinaryDataset", + "IMDBMultiDataset", + "CollabDataset", + "ProteinsDataset", + "REDDITBinary", + "REDDITMulti5K", + "REDDITMulti12K", + "PTCMRDataset", + "NCI1Dataset", + "ENZYMES", + "QM9Dataset", + "OGBNproductsDataset", + "OGBNproteinsDataset", + "OGBNarxivDataset", + "OGBNpapers100MDataset", + "OGBNmagDataset", + "OGBGmolhivDataset", + "OGBGmolpcbaDataset", + "OGBGppaDataset", + "OGBGcodeDataset", + "OGBLppaDataset", + "OGBLcollabDataset", + "OGBLddiDataset", + "OGBLcitationDataset", + "OGBLwikikgDataset", + "OGBLbiokgDataset", + "GatneDataset", + "AmazonDataset", + "TwitterDataset", + "YouTubeDataset", + "GTNDataset", + "ACM_GTNDataset", + "DBLP_GTNDataset", + "IMDB_GTNDataset", + "HANDataset", + "ACM_HANDataset", + "DBLP_HANDataset", + "IMDB_HANDataset", + "MatlabMatrix", + "BlogcatalogDataset", + "WikipediaDataset", + "PPIDataset", + "ModelNet10", + "ModelNet40", + "ModelNet10Train", + "ModelNet10Test", + "ModelNet40Train", + "ModelNet40Test", ] diff --git a/autogl/module/__init__.py b/autogl/module/__init__.py index bf9a71b..80f94da 100644 --- a/autogl/module/__init__.py +++ b/autogl/module/__init__.py @@ -1,3 +1,12 @@ +from . import ( + feature, + model, + train, + hpo, + nas, + ensemble +) + from .ensemble import * from .feature import * from .hpo import * diff --git a/autogl/module/feature/__init__.py b/autogl/module/feature/__init__.py index 20738f7..ec789a1 100644 --- a/autogl/module/feature/__init__.py +++ b/autogl/module/feature/__init__.py @@ -1,5 +1,3 @@ -import importlib -import os from .base import BaseFeatureAtom from .base import BaseFeatureEngineer @@ -28,13 +26,83 @@ def register_feature(name): from .auto_feature import AutoFeatureEngineer from .base import BaseFeatureEngineer -from .generators import BaseGenerator -from .selectors import BaseSelector +from .generators import ( + BaseGenerator, + GeGraphlet, + GeEigen, + GePageRank, + register_pyg, + pygfunc, + PYGGenerator, + PYGLocalDegreeProfile, + PYGNormalizeFeatures, + PYGOneHotDegree +) -from .subgraph import BaseSubgraph +from .selectors import ( + BaseSelector, + SeFilterConstant, + SeGBDT +) + +from .subgraph import ( + BaseSubgraph, + SgNetLSD, + register_nx, + NxSubgraph, + nxfunc, + NxLargeCliqueSize, + NxAverageClusteringApproximate, + NxDegreeAssortativityCoefficient, + NxDegreePearsonCorrelationCoefficient, + NxHasBridge, + NxGraphCliqueNumber, + NxGraphNumberOfCliques, + NxTransitivity, + NxAverageClustering, + NxIsConnected, + NxNumberConnectedComponents, + NxIsDistanceRegular, + NxLocalEfficiency, + NxGlobalEfficiency, + NxIsEulerian, +) __all__ = [ "BaseFeatureEngineer", "AutoFeatureEngineer", "BaseFeatureAtom", + "BaseGenerator", + "GeGraphlet", + "GeEigen", + "GePageRank", + "register_pyg", + "pygfunc", + "PYGGenerator", + "PYGLocalDegreeProfile", + "PYGNormalizeFeatures", + "PYGOneHotDegree", + "BaseSelector", + "SeFilterConstant", + "SeGBDT", + "BaseSubgraph", + "SgNetLSD", + "register_nx", + "NxSubgraph", + "nxfunc", + "NxLargeCliqueSize", + "NxAverageClusteringApproximate", + "NxDegreeAssortativityCoefficient", + "NxDegreePearsonCorrelationCoefficient", + "NxHasBridge", + "NxGraphCliqueNumber", + "NxGraphNumberOfCliques", + "NxTransitivity", + "NxAverageClustering", + "NxIsConnected", + "NxNumberConnectedComponents", + "NxIsDistanceRegular", + "NxLocalEfficiency", + "NxGlobalEfficiency", + "NxIsEulerian", ] diff --git a/autogl/module/feature/generators/__init__.py b/autogl/module/feature/generators/__init__.py index 3c3e2da..c15a9b3 100644 --- a/autogl/module/feature/generators/__init__.py +++ b/autogl/module/feature/generators/__init__.py @@ -2,6 +2,17 @@ from .base import BaseGenerator from .graphlet import GeGraphlet from .eigen import GeEigen from .page_rank import GePageRank -from .pyg import * +from .pyg import register_pyg, PYGGenerator, pygfunc, PYGLocalDegreeProfile, PYGNormalizeFeatures, PYGOneHotDegree -__all__ = ["BaseGenerator", "GeGraphlet", "GeEigen", "GePageRank"] +__all__ = [ + "BaseGenerator", + "GeGraphlet", + "GeEigen", + "GePageRank", + "register_pyg", + "pygfunc", + "PYGGenerator", + "PYGLocalDegreeProfile", + "PYGNormalizeFeatures", + "PYGOneHotDegree" +] diff --git a/autogl/module/feature/selectors/__init__.py b/autogl/module/feature/selectors/__init__.py index 8faf9aa..8a8d689 100644 --- a/autogl/module/feature/selectors/__init__.py +++ b/autogl/module/feature/selectors/__init__.py @@ -1,5 +1,3 @@ -import importlib -import os from .base import BaseSelector from .se_filter_constant import SeFilterConstant from .se_gbdt import SeGBDT diff --git a/autogl/module/feature/subgraph/__init__.py b/autogl/module/feature/subgraph/__init__.py index 3058285..abf1b99 100644 --- a/autogl/module/feature/subgraph/__init__.py +++ b/autogl/module/feature/subgraph/__init__.py @@ -1,4 +1,45 @@ from .netlsd import SgNetLSD from .base import BaseSubgraph +from .nx import ( + register_nx, + NxSubgraph, + nxfunc, + NxLargeCliqueSize, + NxAverageClusteringApproximate, + NxDegreeAssortativityCoefficient, + NxDegreePearsonCorrelationCoefficient, + NxHasBridge, + NxGraphCliqueNumber, + NxGraphNumberOfCliques, + NxTransitivity, + NxAverageClustering, + NxIsConnected, + NxNumberConnectedComponents, + NxIsDistanceRegular, + NxLocalEfficiency, + NxGlobalEfficiency, + NxIsEulerian, +) -__all__ = ["SgNetLSD", "BaseSubgraph"] +__all__ = [ + "SgNetLSD", + "BaseSubgraph", + "register_nx", + "NxSubgraph", + "nxfunc", + "NxLargeCliqueSize", + "NxAverageClusteringApproximate", + "NxDegreeAssortativityCoefficient", + "NxDegreePearsonCorrelationCoefficient", + "NxHasBridge", + "NxGraphCliqueNumber", + "NxGraphNumberOfCliques", + "NxTransitivity", + "NxAverageClustering", + "NxIsConnected", + "NxNumberConnectedComponents", + "NxIsDistanceRegular", + "NxLocalEfficiency", + "NxGlobalEfficiency", + "NxIsEulerian", +] diff --git a/autogl/module/feature/subgraph/netlsd.py b/autogl/module/feature/subgraph/netlsd.py index 52a946e..65b3644 100644 --- a/autogl/module/feature/subgraph/netlsd.py +++ b/autogl/module/feature/subgraph/netlsd.py @@ -1,6 +1,5 @@ import netlsd from .base import BaseSubgraph -import numpy as np import torch from .. import register_feature diff --git a/autogl/module/feature/subgraph/nx.py b/autogl/module/feature/subgraph/nx.py index ff2ba16..0653cc9 100644 --- a/autogl/module/feature/subgraph/nx.py +++ b/autogl/module/feature/subgraph/nx.py @@ -4,7 +4,6 @@ from networkx.algorithms.efficiency_measures import local_efficiency from networkx.algorithms.distance_regular import is_distance_regular from networkx.algorithms.components import number_connected_components from networkx.algorithms.components import is_connected -from networkx.algorithms.cluster import average_clustering from networkx.algorithms.cluster import transitivity from networkx.algorithms.clique import graph_number_of_cliques from networkx.algorithms.clique import graph_clique_number @@ -13,11 +12,8 @@ from networkx.algorithms.assortativity import degree_pearson_correlation_coeffic from networkx.algorithms.assortativity import degree_assortativity_coefficient from networkx.algorithms.approximation.clustering_coefficient import average_clustering from networkx.algorithms.approximation.clique import large_clique_size -import netlsd from .base import BaseSubgraph -import numpy as np import torch -from functools import wraps from .. import register_feature NX_EXTRACTORS = [] diff --git a/autogl/module/feature/subgraph/stats.py b/autogl/module/feature/subgraph/stats.py deleted file mode 100644 index a22b22b..0000000 --- a/autogl/module/feature/subgraph/stats.py +++ /dev/null @@ -1 +0,0 @@ -import numpy as np diff --git a/autogl/module/model/__init__.py b/autogl/module/model/__init__.py index 67d778c..0a816a2 100644 --- a/autogl/module/model/__init__.py +++ b/autogl/module/model/__init__.py @@ -8,3 +8,15 @@ from .graph_saint import GraphSAINTAggregationModel from .gcn import AutoGCN from .gat import AutoGAT from .gin import AutoGIN + +__all__ = [ + "ModelUniversalRegistry", + "register_model", + "BaseModel", + "AutoTopkpool", + "AutoSAGE", + "GraphSAINTAggregationModel", + "AutoGCN", + "AutoGAT", + "AutoGIN", +] diff --git a/autogl/module/nas/__init__.py b/autogl/module/nas/__init__.py index b31ae1f..be2b683 100644 --- a/autogl/module/nas/__init__.py +++ b/autogl/module/nas/__init__.py @@ -1,3 +1,9 @@ -from .algorithm import * -from .estimator import * -from .space import * +from . import ( + algorithm, + estimator, + space +) + +from .algorithm import NAS_ALGO_DICT +from .estimator import NAS_ESTIMATOR_DICT +from .space import NAS_SPACE_DICT