Refactor and Clean (qiskit-community#11)

* Refactor * move distribution_learners files under qgan folder
AronDarazs · Mar 15, 2021 · 64c5a8e · 64c5a8e
1 parent c1b224e
commit 64c5a8e
Show file tree

Hide file tree

Showing 57 changed files with 144 additions and 3,706 deletions.
diff --git a/.github/actions/install-machine-learning/action.yml b/.github/actions/install-machine-learning/action.yml
@@ -17,6 +17,6 @@ runs:
   using: "composite"
   steps: 
     - run : |
-        pip install -e .[torch,cvx]
+        pip install -e .[torch]
         pip install -U -c constraints.txt -r requirements-dev.txt
       shell: bash
diff --git a/.pylintdict b/.pylintdict
@@ -10,7 +10,6 @@ codeword
 contravariance
 currentmodule
 cvs
-cvxpy
 data's
 datapoints
 dataset

diff --git a/README.md b/README.md
@@ -32,8 +32,6 @@ To do this follow the instructions in the
   package or refer to PyTorch [getting started](https://pytorch.org/get-started/locally/). PyTorch
   being installed will enable the neural networks `PyTorchDiscriminator` component to be used with
   the QGAN algorithm.
-* **CVXPY**, may be installed using command `pip install 'qiskit-machine-learning[cvx]'` to enable use of the
-  `QSVM` and the classical `SklearnSVM` algorithms.
 
 ### Creating Your First Machine Learning Programming Experiment in Qiskit
 

diff --git a/docs/apidocs/qiskit_machine_learning.multiclass_extensions.rst b/docs/apidocs/qiskit_machine_learning.multiclass_extensions.rst
diff --git a/docs/apidocs/qiskit_machine_learning.utils.rst b/docs/apidocs/qiskit_machine_learning.utils.rst
diff --git a/qiskit_machine_learning/__init__.py b/qiskit_machine_learning/__init__.py
@@ -37,9 +37,7 @@
    algorithms
    circuit.library
    datasets
-   multiclass_extensions
    neural_networks
-   utils
 
 """
 

diff --git a/qiskit_machine_learning/algorithms/__init__.py b/qiskit_machine_learning/algorithms/__init__.py
@@ -26,9 +26,7 @@
    :toctree: ../stubs/
    :nosignatures:
 
-   QSVM
    VQC
-   SklearnSVM
 
 Distribution Learners
 +++++++++++++++++++++
@@ -37,16 +35,28 @@
    :toctree: ../stubs/
    :nosignatures:
 
+   DiscriminativeNetwork
+   GenerativeNetwork
+   NumPyDiscriminator
+   PyTorchDiscriminator
+   QuantumGenerator
    QGAN
 
 """
 
-from .classifiers import VQC, QSVM, SklearnSVM
-from .distribution_learners import QGAN
+from .classifiers import VQC
+from .distribution_learners import (DiscriminativeNetwork,
+                                    GenerativeNetwork,
+                                    NumPyDiscriminator,
+                                    PyTorchDiscriminator,
+                                    QuantumGenerator, QGAN)
 
 __all__ = [
     'VQC',
-    'QSVM',
-    'SklearnSVM',
+    'DiscriminativeNetwork',
+    'GenerativeNetwork',
+    'NumPyDiscriminator',
+    'PyTorchDiscriminator',
+    'QuantumGenerator',
     'QGAN',
 ]
diff --git a/qiskit_machine_learning/algorithms/classifiers/__init__.py b/qiskit_machine_learning/algorithms/classifiers/__init__.py
@@ -13,10 +13,7 @@
 """ Classifiers Package """
 
 from .vqc import VQC
-from .qsvm import QSVM
-from .sklearn_svm import SklearnSVM
 
 __all__ = [
-    'VQC',
-    'QSVM',
-    'SklearnSVM']
+    'VQC'
+]
diff --git a/qiskit_machine_learning/algorithms/classifiers/qsvm/__init__.py b/qiskit_machine_learning/algorithms/classifiers/qsvm/__init__.py
diff --git a/qiskit_machine_learning/algorithms/classifiers/qsvm/_qsvm_abc.py b/qiskit_machine_learning/algorithms/classifiers/qsvm/_qsvm_abc.py
diff --git a/qiskit_machine_learning/algorithms/classifiers/qsvm/_qsvm_binary.py b/qiskit_machine_learning/algorithms/classifiers/qsvm/_qsvm_binary.py
diff --git a/qiskit_machine_learning/algorithms/classifiers/qsvm/_qsvm_estimator.py b/qiskit_machine_learning/algorithms/classifiers/qsvm/_qsvm_estimator.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ codeword @@
     contravariance
     currentmodule
     cvs
-    cvxpy
     data's
     datapoints
     dataset
@@ Expand Down @@