changed a few things around

jhu_primitives/__init__.py

@@ -12,7 +12,6 @@
 from .lse import LaplacianSpectralEmbedding
 from .dimselect import DimensionSelection
 from .gclust import GaussianClustering
-from .lcc import LargestConnectedComponent
 from .nonpar import NonParametricClustering
 from .numclust import NumberOfClusters
 from .oocase import OutOfCoreAdjacencySpectralEmbedding

jhu_primitives/ase/ase.py

@@ -10,13 +10,12 @@
 import os
 
 
-from primitive_interfaces.transformer import TransformerPrimitiveBase
-#from jhu_primitives.core.JHUGraph import JHUGraph
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 import numpy as np
-from d3m_metadata import container, hyperparams, metadata as metadata_module, params, utils
-from primitive_interfaces import base
-from primitive_interfaces.base import CallResult
-
+from d3m import utils
+from d3m_metadata import hyperparams, base as metadata_module, params
+from d3m.primitive_interfaces import base
+from d3m.primitive_interfaces.base import CallResult
 
 Inputs = container.matrix
 Outputs = container.ndarray

jhu_primitives/dimselect/dimselect.py

@@ -9,14 +9,12 @@
 import os
 import rpy2.robjects.numpy2ri
 rpy2.robjects.numpy2ri.activate()
-from primitive_interfaces.transformer import TransformerPrimitiveBase
-#from jhu_primitives.core.JHUGraph import JHUGraph
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 import numpy as np
-from d3m_metadata import container, hyperparams, metadata as metadata_module, params, utils
-from primitive_interfaces import base
-from primitive_interfaces.base import CallResult
-
-
+from d3m import utils
+from d3m_metadata import hyperparams, base as metadata_module, params
+from d3m.primitive_interfaces import base
+from d3m.primitive_interfaces.base import CallResult
 
 Inputs = container.ndarray
 Outputs = container.ndarray

jhu_primitives/gclust/gclust.py

@@ -8,11 +8,9 @@
 import os
 import rpy2.robjects.numpy2ri
 rpy2.robjects.numpy2ri.activate()
-from primitive_interfaces.transformer import TransformerPrimitiveBase
-#from jhu_primitives.core.JHUGraph import JHUGraph
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 import numpy as np
 
-
 from d3m import container
 from d3m import utils
 from d3m.metadata import hyperparams, base as metadata_module, params

jhu_primitives/lse/lse.py

@@ -8,21 +8,17 @@
 import os
 
 
-from primitive_interfaces.transformer import TransformerPrimitiveBase
-#from jhu_primitives.core.JHUGraph import JHUGraph
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 import numpy as np
 
 
 from d3m import container
 from d3m import utils
-#from d3m.metadata import container, hyperparams, metadata as metadata_module, params, utils
 from d3m.metadata import hyperparams, base as metadata_module, params
 
 from d3m.primitive_interfaces import base
 from d3m.primitive_interfaces.base import CallResult
 
-
-
 Inputs = container.matrix
 Outputs = container.ndarray
 
@@ -116,4 +112,4 @@ def produce(self, *, inputs: Inputs, timeout: float = None, iterations: int = No
         vectors = container.ndarray(result[0])
         eig_values = container.ndarray(result[1])
 
-        return base.CallResult([vectors, eig_values])
+        return base.CallResult([vectors, eig_values])

jhu_primitives/nonpar/nonpar.py

@@ -7,8 +7,7 @@
 from typing import Sequence, TypeVar, Union, Dict
 import os
 
-from primitive_interfaces.transformer import TransformerPrimitiveBase
-#from jhu_primitives.core.JHUGraph import JHUGraph
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 import numpy as np
 
 
@@ -18,8 +17,6 @@
 from d3m.primitive_interfaces import base
 from d3m.primitive_interfaces.base import CallResult
 
-
-
 Inputs = container.ndarray
 Outputs = container.ndarray
 

jhu_primitives/numclust/numclust.py

@@ -8,11 +8,9 @@
 import os
 import rpy2.robjects.numpy2ri
 rpy2.robjects.numpy2ri.activate()
-from primitive_interfaces.transformer import TransformerPrimitiveBase
-#from jhu_primitives.core.JHUGraph import JHUGraph
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 import numpy as np
 
-
 from d3m import container
 from d3m import utils
 from d3m.metadata import hyperparams, base as metadata_module, params
@@ -29,7 +27,6 @@ class Hyperparams(hyperparams.Hyperparams):
     #hp = hyperparams.Hyperparameter[None](default = None)
     hp = None
 
-
 def file_path_conversion(abs_file_path, uri="file"):
     local_drive, file_path = abs_file_path.split(':')[0], abs_file_path.split(':')[1]
     path_sep = file_path[0]

jhu_primitives/oocase/oocase.py

@@ -8,11 +8,9 @@
 import os
 
 
-from primitive_interfaces.transformer import TransformerPrimitiveBase
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 #from jhu_primitives.core.JHUGraph import JHUGraph
 import numpy as np
-
-
 from d3m import container
 from d3m import utils
 from d3m.metadata import hyperparams, base as metadata_module, params

jhu_primitives/ptr/ptr.py

@@ -7,17 +7,12 @@
 from rpy2 import robjects
 from typing import Sequence, TypeVar, Union, Dict
 import os
-
-
-from primitive_interfaces.transformer import TransformerPrimitiveBase
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 #from jhu_primitives.core.JHUGraph import JHUGraph
 import numpy as np
-
-
 from d3m import container
 from d3m import utils
 from d3m.metadata import hyperparams, base as metadata_module, params
-
 from d3m.primitive_interfaces import base
 from d3m.primitive_interfaces.base import CallResult
 

jhu_primitives/sgc/sgc.py

@@ -8,11 +8,8 @@
 import os
 
 
-from primitive_interfaces.transformer import TransformerPrimitiveBase
-#from jhu_primitives.core.JHUGraph import JHUGraph
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 import numpy as np
-
-
 from d3m import container
 from d3m import utils
 from d3m.metadata import hyperparams, base as metadata_module, params

jhu_primitives/sgm/sgm.py

@@ -6,16 +6,12 @@
 from typing import Sequence, TypeVar, Union, Dict
 import os
 
-
-from primitive_interfaces.transformer import TransformerPrimitiveBase
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 #from jhu_primitives.core.JHUGraph import JHUGraph
 import numpy as np
-
-
 from d3m import container
 from d3m import utils
 from d3m.metadata import hyperparams, base as metadata_module, params
-
 from d3m.primitive_interfaces import base
 from d3m.primitive_interfaces.base import CallResult
 

jhu_primitives/vnsgm/vnsgm.py

@@ -8,11 +8,9 @@
 import os
 
 
-from primitive_interfaces.transformer import TransformerPrimitiveBase
+from d3m.primitive_interfaces.transformer import TransformerPrimitiveBase
 #from jhu_primitives.core.JHUGraph import JHUGraph
 import numpy as np
-
-
 from d3m import container
 from d3m import utils
 from d3m.metadata import hyperparams, base as metadata_module, params