make fairing as a subpackage in kubeflow

kubeflow · Aug 31, 2019 · 9c41bf9 · 9c41bf9
1 parent cd8b460
commit 9c41bf9
Show file tree

Hide file tree

Showing 177 changed files with 253 additions and 244 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,7 +19,7 @@ about: Tell us about a problem you are experiencing
 
 **Environment:**
 
-- Fairing version: (use `python -c "import fairing; print(fairing.__version__)"`):
+- Fairing version: (use `python -c "import kubeflow; print(kubeflow.__version__)"`):
 - Kubeflow version: (version number can be found at the bottom left corner of the Kubeflow dashboard):
 - Minikube version:
 - Kubernetes version: (use `kubectl version`):

diff --git a/Dockerfile b/Dockerfile
@@ -38,10 +38,10 @@ COPY --chown=jovyan:users requirements.txt /home/jovyan/work/fairing/
 RUN pip install --user -r requirements.txt
 
 COPY --chown=jovyan:users integration/ipython_kernel_config.py /home/jovyan/.ipython/profile_default/ipython_kernel_config.py
-COPY --chown=jovyan:users containerregistry /home/jovyan/work/fairing/containerregistry
+COPY --chown=jovyan:users kubeflow/fairing/containerregistry /home/jovyan/work/fairing/containerregistry
 
-COPY --chown=jovyan:users examples/notebook /home/jovyan/work/fairing/
-COPY --chown=jovyan:users fairing /home/jovyan/work/fairing/fairing
+COPY --chown=jovyan:users examples/fairing/notebook /home/jovyan/work/fairing/
+COPY --chown=jovyan:users kubeflow/fairing /home/jovyan/work/fairing/fairing
 
 
 
diff --git a/Dockerfile.test b/Dockerfile.test
@@ -17,8 +17,8 @@ ENV PATH=/builder/google-cloud-sdk/bin/:$PATH
 RUN pip install pytest pytest-cov pytest-xdist papermill
 # TODO: Find a better to run e2e tests without
 # adding a lot of reqs
-COPY examples/prediction/requirements.txt  examples/prediction/requirements.txt 
-RUN pip install -r examples/prediction/requirements.txt
+COPY examples/fairing/prediction/requirements.txt  examples/fairing/prediction/requirements.txt 
+RUN pip install -r examples/fairing/prediction/requirements.txt
 
 # Install dependencies
 COPY setup.py requirements.txt /opt/fairing/

diff --git a/examples/distributed-training/main.py → ...ples/fairing/distributed-training/main.py b/examples/distributed-training/main.py → ...ples/fairing/distributed-training/main.py
@@ -227,7 +227,7 @@ def feed_dict(train):
 
 if __name__ == '__main__':
     if os.getenv('FAIRING_RUNTIME', None) is None:
-        import fairing
+        from kubeflow import fairing
         fairing.config.set_preprocessor('python', input_files=[__file__])
         fairing.config.set_builder(
             name='docker', registry='gcr.io/mrick-gcp', base_image='tensorflow/tensorflow')

diff --git a/...les/distributed-training/requirements.txt → ...ing/distributed-training/requirements.txt b/...les/distributed-training/requirements.txt → ...ing/distributed-training/requirements.txt
diff --git a/examples/gcp/hello-world-gpu-pytorch.py → ...es/fairing/gcp/hello-world-gpu-pytorch.py b/examples/gcp/hello-world-gpu-pytorch.py → ...es/fairing/gcp/hello-world-gpu-pytorch.py
@@ -17,7 +17,7 @@ def train():
     if os.getenv('FAIRING_RUNTIME', None) is not None:
         train()
     else:
-        import fairing
+        from kubeflow import fairing
         # Setting up google container repositories (GCR) for storing output containers
         # You can use any docker container registry istead of GCR
         GCP_PROJECT = fairing.cloud.gcp.guess_project_name()

diff --git a/examples/kfserving/main.py → examples/fairing/kfserving/main.py b/examples/kfserving/main.py → examples/fairing/kfserving/main.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-import fairing
+from kubeflow import fairing
 
 if __name__ == '__main__':
     fairing.config.set_deployer(

diff --git a/examples/kubeflow-gke/main.py → examples/fairing/kubeflow-gke/main.py b/examples/kubeflow-gke/main.py → examples/fairing/kubeflow-gke/main.py
@@ -73,7 +73,7 @@ def train():
 
 if __name__ == '__main__':
     if os.getenv('FAIRING_RUNTIME', None) is None:
-        import fairing
+        from kubeflow import fairing
         fairing.config.set_preprocessor('python', input_files=[__file__])
         fairing.config.set_builder(
             'append', base_image='tensorflow/tensorflow:1.13.1-py3')

diff --git a/examples/kubeflow/main.py → examples/fairing/kubeflow/main.py b/examples/kubeflow/main.py → examples/fairing/kubeflow/main.py
@@ -74,7 +74,7 @@ def train(self, **kwargs): #pylint:disable=unused-argument
 
 if __name__ == '__main__':
     if os.getenv('FAIRING_RUNTIME', None) is None:
-        import fairing
+        from kubeflow import fairing
         fairing.config.set_preprocessor('python', input_files=[__file__])
         fairing.config.set_builder(name='docker', registry='<your-registry-name>',
                                    base_image='tensorflow/tensorflow:1.13.1-py3')

diff --git a/...les/kubernetes-in-cluster-builder/main.py → ...ing/kubernetes-in-cluster-builder/main.py b/...les/kubernetes-in-cluster-builder/main.py → ...ing/kubernetes-in-cluster-builder/main.py
@@ -73,7 +73,7 @@ def train(self):
 
 if __name__ == '__main__':
     if os.getenv('FAIRING_RUNTIME', None) is None:
-        import fairing
+        from kubeflow import fairing
         fairing.config.set_preprocessor('python', input_files=[__file__])
         fairing.config.set_builder(
             name='cluster', registry='<your-registry-here>')

diff --git a/...netes-in-cluster-builder/requirements.txt → ...netes-in-cluster-builder/requirements.txt b/...netes-in-cluster-builder/requirements.txt → ...netes-in-cluster-builder/requirements.txt
diff --git a/examples/kubernetes/main.py → examples/fairing/kubernetes/main.py b/examples/kubernetes/main.py → examples/fairing/kubernetes/main.py
@@ -72,7 +72,7 @@ def train():
 
 if __name__ == '__main__':
     if os.getenv('FAIRING_RUNTIME', None) is None:
-        import fairing
+        from kubeflow import fairing
         fairing.config.set_preprocessor('python', input_files=[__file__])
         fairing.config.set_builder('docker', registry='<your-registry-name>',
                                    base_image='tensorflow/tensorflow:1.13.1-py3')

diff --git a/examples/kubernetes/requirements.txt → examples/fairing/kubernetes/requirements.txt b/examples/kubernetes/requirements.txt → examples/fairing/kubernetes/requirements.txt
diff --git a/examples/lightgbm/Dockerfile → examples/fairing/lightgbm/Dockerfile b/examples/lightgbm/Dockerfile → examples/fairing/lightgbm/Dockerfile
diff --git a/.../distributed-training-data-parallel.ipynb → .../distributed-training-data-parallel.ipynb b/.../distributed-training-data-parallel.ipynb → .../distributed-training-data-parallel.ipynb
@@ -15,8 +15,8 @@
    "source": [
     "import os\n",
     "from time import gmtime, strftime\n",
-    "import fairing\n",
-    "from fairing.frameworks import lightgbm\n",
+    "from kubeflow import fairing\n",
+    "from kubeflow.fairing.frameworks import lightgbm\n",
     "\n",
     "# Setting up google container repositories (GCR) for storing output containers\n",
     "# You can use any docker container registry istead of GCR\n",

diff --git a/examples/lightgbm/distributed-training.ipynb → ...iring/lightgbm/distributed-training.ipynb b/examples/lightgbm/distributed-training.ipynb → ...iring/lightgbm/distributed-training.ipynb
@@ -15,8 +15,8 @@
    "source": [
     "import os\n",
     "from time import gmtime, strftime\n",
-    "import fairing\n",
-    "from fairing.frameworks import lightgbm\n",
+    "from kubeflow import fairing\n",
+    "from kubeflow.fairing.frameworks import lightgbm\n",
     "\n",
     "# Setting up google container repositories (GCR) for storing output containers\n",
     "# You can use any docker container registry istead of GCR\n",

diff --git a/examples/lightgbm/simple-training.ipynb → ...es/fairing/lightgbm/simple-training.ipynb b/examples/lightgbm/simple-training.ipynb → ...es/fairing/lightgbm/simple-training.ipynb
@@ -13,7 +13,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import fairing\n",
+    "from kubeflow import fairing\n",
     "\n",
     "# Setting up google container repositories (GCR) for storing output containers\n",
     "# You can use any docker container registry istead of GCR\n",
@@ -54,8 +54,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import fairing\n",
-    "from fairing.frameworks import lightgbm"
+    "from kubeflow import fairing\n",
+    "from kubeflow.fairing.frameworks import lightgbm"
    ]
   },
   {

diff --git a/examples/notebook/deploy-to-gcp.ipynb → ...ples/fairing/notebook/deploy-to-gcp.ipynb b/examples/notebook/deploy-to-gcp.ipynb → ...ples/fairing/notebook/deploy-to-gcp.ipynb
@@ -183,7 +183,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from fairing.deployers.gcp.gcpserving import GCPServingDeployer\n",
+    "from kubeflow.fairing.deployers.gcp.gcpserving import GCPServingDeployer\n",
     "deployer = GCPServingDeployer()\n",
     "deployer.deploy(VERSION_DIR, MODEL_NAME, VERSION_NAME)"
    ]

diff --git a/examples/notebook/fairing-kubeflow-gke.ipynb → ...iring/notebook/fairing-kubeflow-gke.ipynb b/examples/notebook/fairing-kubeflow-gke.ipynb → ...iring/notebook/fairing-kubeflow-gke.ipynb
@@ -34,7 +34,7 @@
     "from tensorflow.examples.tutorials.mnist import input_data\n",
     "from tensorflow.examples.tutorials.mnist import mnist\n",
     "\n",
-    "import fairing\n",
+    "from kubeflow import fairing\n",
     "fairing.config.set_builder(name='append')\n",
     "\n",
     "INPUT_DATA_DIR = '/tmp/tensorflow/mnist/input_data/'\n",

diff --git a/examples/notebook/fairing-xgboost.ipynb → ...es/fairing/notebook/fairing-xgboost.ipynb b/examples/notebook/fairing-xgboost.ipynb → ...es/fairing/notebook/fairing-xgboost.ipynb
@@ -114,7 +114,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import fairing\n",
+    "from kubeflow import fairing\n",
     "run_training_and_eval = fairing.config.fn(run_training_and_eval)\n",
     "run_training_and_eval()"
    ]

diff --git a/examples/notebook/hello-world.ipynb → examples/fairing/notebook/hello-world.ipynb b/examples/notebook/hello-world.ipynb → examples/fairing/notebook/hello-world.ipynb
@@ -7,7 +7,7 @@
    "outputs": [],
    "source": [
     "import os\n",
-    "import fairing"
+    "from kubeflow import fairing"
    ]
   },
   {

diff --git a/examples/prediction/Dockerfile → examples/fairing/prediction/Dockerfile b/examples/prediction/Dockerfile → examples/fairing/prediction/Dockerfile
diff --git a/examples/prediction/HousingServe.py → examples/fairing/prediction/HousingServe.py b/examples/prediction/HousingServe.py → examples/fairing/prediction/HousingServe.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import joblib
-import fairing
 import numpy as np
+from kubeflow import fairing
 
 MODEL_FILE = 'trained_ames_model.dat'
 

diff --git a/examples/prediction/HousingTrain.py → examples/fairing/prediction/HousingTrain.py b/examples/prediction/HousingTrain.py → examples/fairing/prediction/HousingTrain.py
diff --git a/examples/prediction/README.md → examples/fairing/prediction/README.md b/examples/prediction/README.md → examples/fairing/prediction/README.md
diff --git a/...diction/ames_dataset/data_description.txt → ...diction/ames_dataset/data_description.txt b/...diction/ames_dataset/data_description.txt → ...diction/ames_dataset/data_description.txt
diff --git a/...iction/ames_dataset/sample_submission.csv → ...iction/ames_dataset/sample_submission.csv b/...iction/ames_dataset/sample_submission.csv → ...iction/ames_dataset/sample_submission.csv
diff --git a/examples/prediction/ames_dataset/test.csv → .../fairing/prediction/ames_dataset/test.csv b/examples/prediction/ames_dataset/test.csv → .../fairing/prediction/ames_dataset/test.csv
diff --git a/examples/prediction/ames_dataset/train.csv → ...fairing/prediction/ames_dataset/train.csv b/examples/prediction/ames_dataset/train.csv → ...fairing/prediction/ames_dataset/train.csv
diff --git a/examples/prediction/requirements.txt → examples/fairing/prediction/requirements.txt b/examples/prediction/requirements.txt → examples/fairing/prediction/requirements.txt
diff --git a/examples/prediction/trained_ames_model.dat → ...fairing/prediction/trained_ames_model.dat b/examples/prediction/trained_ames_model.dat → ...fairing/prediction/trained_ames_model.dat
diff --git a/examples/prediction/xgboost-gkeop.ipynb → ...es/fairing/prediction/xgboost-gkeop.ipynb b/examples/prediction/xgboost-gkeop.ipynb → ...es/fairing/prediction/xgboost-gkeop.ipynb
@@ -218,7 +218,7 @@
    "outputs": [],
    "source": [
     "import os\n",
-    "import fairing\n",
+    "from kubeflow import fairing\n",
     "\n",
     "# Setting up google container repositories (GCR) for storing output containers\n",
     "# You can use any docker container registry istead of GCR\n",
@@ -245,11 +245,11 @@
    },
    "outputs": [],
    "source": [
-    "import fairing\n",
-    "from fairing.builders.cluster import gcs_context\n",
-    "from fairing.builders.cluster.cluster import ClusterBuilder\n",
-    "from fairing.deployers.tfjob.tfjob import TfJob\n",
-    "from fairing.preprocessors.function import FunctionPreProcessor\n",
+    "from kubeflow import fairing\n",
+    "from kubeflow.fairing.builders.cluster import gcs_context\n",
+    "from kubeflow.fairing.builders.cluster.cluster import ClusterBuilder\n",
+    "from kubeflow.fairing.deployers.tfjob.tfjob import TfJob\n",
+    "from kubeflow.fairing.preprocessors.function import FunctionPreProcessor\n",
     "\n",
     "preprocessor = FunctionPreProcessor(function_obj=HousingServe, input_files=['ames_dataset/train.csv', \"requirements.txt\"])\n",
     "builder = ClusterBuilder(registry=DOCKER_REGISTRY, base_image=BASE_IMAGE, preprocessor=preprocessor,\n",
@@ -280,12 +280,12 @@
    },
    "outputs": [],
    "source": [
-    "import fairing\n",
-    "from fairing.builders.cluster import gcs_context\n",
-    "from fairing.builders.cluster.cluster import ClusterBuilder\n",
-    "from fairing.deployers.job.job import Job\n",
-    "from fairing.deployers.serving.serving import Serving\n",
-    "from fairing.preprocessors.function import FunctionPreProcessor\n",
+    "from kubeflow import fairing\n",
+    "from kubeflow.fairing.builders.cluster import gcs_context\n",
+    "from kubeflow.fairing.builders.cluster.cluster import ClusterBuilder\n",
+    "from kubeflow.fairing.deployers.job.job import Job\n",
+    "from kubeflow.fairing.deployers.serving.serving import Serving\n",
+    "from kubeflow.fairing.preprocessors.function import FunctionPreProcessor\n",
     "\n",
     "preprocessor = FunctionPreProcessor(function_obj=HousingServe, input_files=['trained_ames_model.dat', \"requirements.txt\"])\n",
     "builder = ClusterBuilder(registry=DOCKER_REGISTRY, base_image=BASE_IMAGE, preprocessor=preprocessor,\n",

diff --git a/.../prediction/xgboost-high-level-apis.ipynb → .../prediction/xgboost-high-level-apis.ipynb b/.../prediction/xgboost-high-level-apis.ipynb → .../prediction/xgboost-high-level-apis.ipynb
@@ -220,7 +220,7 @@
    },
    "outputs": [],
    "source": [
-    "import fairing\n",
+    "from kubeflow import fairing\n",
     "\n",
     "# Default to using the GKE backend.\n",
     "FAIRING_BACKEND = 'KubeflowGKEBackend'\n",
@@ -252,7 +252,7 @@
     "    DOCKER_REGISTRY = 'gcr.io/{}/fairing-job'.format(GCP_PROJECT)\n",
     "    BuildContext = None\n",
     "if FAIRING_BACKEND == 'KubeflowAzureBackend':\n",
-    "    from fairing.builders.cluster.azurestorage_context import StorageContextSource\n",
+    "    from kubeflow.fairing.builders.cluster.azurestorage_context import StorageContextSource\n",
     "    BuildContext = StorageContextSource(\n",
     "        region=AZURE_REGION, resource_group_name=AZURE_RESOURCE_GROUP,\n",
     "        storage_account_name=AZURE_STORAGE_ACCOUNT\n",
@@ -278,7 +278,7 @@
    },
    "outputs": [],
    "source": [
-    "from fairing import TrainJob\n",
+    "from kubeflow.fairing import TrainJob\n",
     "train_job = TrainJob(HousingServe, input_files=['ames_dataset/train.csv', \"requirements.txt\"],\n",
     "                     docker_registry=DOCKER_REGISTRY,\n",
     "                     backend=BackendClass(build_context_source=BuildContext))\n",
@@ -302,7 +302,7 @@
    },
    "outputs": [],
    "source": [
-    "from fairing import PredictionEndpoint\n",
+    "from kubeflow.fairing import PredictionEndpoint\n",
     "endpoint = PredictionEndpoint(HousingServe, input_files=['trained_ames_model.dat', \"requirements.txt\"],\n",
     "                              docker_registry=DOCKER_REGISTRY,\n",
     "                              backend=BackendClass(build_context_source=BuildContext))\n",

diff --git a/...d-deploy-in-gcp-from-local-notebook.ipynb → ...d-deploy-in-gcp-from-local-notebook.ipynb b/...d-deploy-in-gcp-from-local-notebook.ipynb → ...d-deploy-in-gcp-from-local-notebook.ipynb
@@ -191,7 +191,7 @@
    "outputs": [],
    "source": [
     "import os\n",
-    "import fairing\n",
+    "from kubeflow import fairing\n",
     "\n",
     "# Setting up google container repositories (GCR) for storing output containers\n",
     "# You can use any docker container registry istead of GCR\n",

diff --git a/examples/pytorch/mnist/mnist.ipynb → examples/fairing/pytorch/mnist/mnist.ipynb b/examples/pytorch/mnist/mnist.ipynb → examples/fairing/pytorch/mnist/mnist.ipynb
@@ -223,8 +223,8 @@
    "outputs": [],
    "source": [
     "import os\n",
-    "import fairing\n",
-    "from fairing import TrainJob\n",
+    "from kubeflow import fairing\n",
+    "from kubeflow.fairing import TrainJob\n",
     "import sys\n",
     "\n",
     "# Setting up google container repositories (GCR) for storing output containers\n",

diff --git a/examples/pytorch/mnist/requirements.txt → ...es/fairing/pytorch/mnist/requirements.txt b/examples/pytorch/mnist/requirements.txt → ...es/fairing/pytorch/mnist/requirements.txt
diff --git a/examples/simple/main.py → examples/fairing/simple/main.py b/examples/simple/main.py → examples/fairing/simple/main.py
@@ -1,7 +1,7 @@
 import os
-import fairing
 import tensorflow as tf
 
+from kubeflow import fairing
 # Setting up google container repositories (GCR) for storing output containers
 # You can use any docker container registry istead of GCR
 GCP_PROJECT = fairing.cloud.gcp.guess_project_name()

diff --git a/examples/train_job_api/main.ipynb → examples/fairing/train_job_api/main.ipynb b/examples/train_job_api/main.ipynb → examples/fairing/train_job_api/main.ipynb
@@ -6,10 +6,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import fairing\n",
-    "from fairing import TrainJob\n",
-    "from fairing.backends import KubeflowGKEBackend\n",
-    "from fairing.kubernetes.utils import get_resource_mutator"
+    "from kubeflow import fairing\n",
+    "from kubeflow.fairing import TrainJob\n",
+    "from kubeflow.fairing.backends import KubeflowGKEBackend\n",
+    "from kubeflow.fairing.kubernetes.utils import get_resource_mutator"
    ]
   },
   {

diff --git a/examples/train_job_api/train.ipynb → examples/fairing/train_job_api/train.ipynb b/examples/train_job_api/train.ipynb → examples/fairing/train_job_api/train.ipynb
diff --git a/fairing/builders/__init__.py → kubeflow/__init__.py b/fairing/builders/__init__.py → kubeflow/__init__.py
diff --git a/containerregistry/LICENSE → kubeflow/containerregistry/LICENSE b/containerregistry/LICENSE → kubeflow/containerregistry/LICENSE
diff --git a/containerregistry/__init__.py → kubeflow/containerregistry/__init__.py b/containerregistry/__init__.py → kubeflow/containerregistry/__init__.py
diff --git a/containerregistry/client/__init__.py → ...flow/containerregistry/client/__init__.py b/containerregistry/client/__init__.py → ...flow/containerregistry/client/__init__.py
diff --git a/containerregistry/client/docker_creds_.py → ...containerregistry/client/docker_creds_.py b/containerregistry/client/docker_creds_.py → ...containerregistry/client/docker_creds_.py
diff --git a/containerregistry/client/docker_name_.py → .../containerregistry/client/docker_name_.py b/containerregistry/client/docker_name_.py → .../containerregistry/client/docker_name_.py
diff --git a/containerregistry/client/monitor_.py → ...flow/containerregistry/client/monitor_.py b/containerregistry/client/monitor_.py → ...flow/containerregistry/client/monitor_.py
diff --git a/containerregistry/client/v1/__init__.py → ...w/containerregistry/client/v1/__init__.py b/containerregistry/client/v1/__init__.py → ...w/containerregistry/client/v1/__init__.py
diff --git a/containerregistry/client/v1/docker_creds_.py → ...tainerregistry/client/v1/docker_creds_.py b/containerregistry/client/v1/docker_creds_.py → ...tainerregistry/client/v1/docker_creds_.py
diff --git a/containerregistry/client/v1/docker_http_.py → ...ntainerregistry/client/v1/docker_http_.py b/containerregistry/client/v1/docker_http_.py → ...ntainerregistry/client/v1/docker_http_.py
diff --git a/containerregistry/client/v1/docker_image_.py → ...tainerregistry/client/v1/docker_image_.py b/containerregistry/client/v1/docker_image_.py → ...tainerregistry/client/v1/docker_image_.py
diff --git a/...inerregistry/client/v1/docker_session_.py → ...inerregistry/client/v1/docker_session_.py b/...inerregistry/client/v1/docker_session_.py → ...inerregistry/client/v1/docker_session_.py
diff --git a/containerregistry/client/v1/save_.py → ...flow/containerregistry/client/v1/save_.py b/containerregistry/client/v1/save_.py → ...flow/containerregistry/client/v1/save_.py
diff --git a/containerregistry/client/v2/__init__.py → ...w/containerregistry/client/v2/__init__.py b/containerregistry/client/v2/__init__.py → ...w/containerregistry/client/v2/__init__.py
diff --git a/containerregistry/client/v2/append_.py → ...ow/containerregistry/client/v2/append_.py b/containerregistry/client/v2/append_.py → ...ow/containerregistry/client/v2/append_.py
diff --git a/containerregistry/client/v2/docker_creds_.py → ...tainerregistry/client/v2/docker_creds_.py b/containerregistry/client/v2/docker_creds_.py → ...tainerregistry/client/v2/docker_creds_.py
diff --git a/...ainerregistry/client/v2/docker_digest_.py → ...ainerregistry/client/v2/docker_digest_.py b/...ainerregistry/client/v2/docker_digest_.py → ...ainerregistry/client/v2/docker_digest_.py
diff --git a/containerregistry/client/v2/docker_http_.py → ...ntainerregistry/client/v2/docker_http_.py b/containerregistry/client/v2/docker_http_.py → ...ntainerregistry/client/v2/docker_http_.py
diff --git a/containerregistry/client/v2/docker_image_.py → ...tainerregistry/client/v2/docker_image_.py b/containerregistry/client/v2/docker_image_.py → ...tainerregistry/client/v2/docker_image_.py
diff --git a/...inerregistry/client/v2/docker_session_.py → ...inerregistry/client/v2/docker_session_.py b/...inerregistry/client/v2/docker_session_.py → ...inerregistry/client/v2/docker_session_.py
diff --git a/containerregistry/client/v2/util_.py → ...flow/containerregistry/client/v2/util_.py b/containerregistry/client/v2/util_.py → ...flow/containerregistry/client/v2/util_.py
diff --git a/containerregistry/client/v2/v1_compat_.py → ...containerregistry/client/v2/v1_compat_.py b/containerregistry/client/v2/v1_compat_.py → ...containerregistry/client/v2/v1_compat_.py
diff --git a/containerregistry/client/v2_2/__init__.py → ...containerregistry/client/v2_2/__init__.py b/containerregistry/client/v2_2/__init__.py → ...containerregistry/client/v2_2/__init__.py
diff --git a/containerregistry/client/v2_2/append_.py → .../containerregistry/client/v2_2/append_.py b/containerregistry/client/v2_2/append_.py → .../containerregistry/client/v2_2/append_.py
diff --git a/...inerregistry/client/v2_2/docker_creds_.py → ...inerregistry/client/v2_2/docker_creds_.py b/...inerregistry/client/v2_2/docker_creds_.py → ...inerregistry/client/v2_2/docker_creds_.py
diff --git a/...nerregistry/client/v2_2/docker_digest_.py → ...nerregistry/client/v2_2/docker_digest_.py b/...nerregistry/client/v2_2/docker_digest_.py → ...nerregistry/client/v2_2/docker_digest_.py
diff --git a/...ainerregistry/client/v2_2/docker_http_.py → ...ainerregistry/client/v2_2/docker_http_.py b/...ainerregistry/client/v2_2/docker_http_.py → ...ainerregistry/client/v2_2/docker_http_.py
diff --git a/...inerregistry/client/v2_2/docker_image_.py → ...inerregistry/client/v2_2/docker_image_.py b/...inerregistry/client/v2_2/docker_image_.py → ...inerregistry/client/v2_2/docker_image_.py
diff --git a/...egistry/client/v2_2/docker_image_list_.py → ...egistry/client/v2_2/docker_image_list_.py b/...egistry/client/v2_2/docker_image_list_.py → ...egistry/client/v2_2/docker_image_list_.py
diff --git a/...erregistry/client/v2_2/docker_session_.py → ...erregistry/client/v2_2/docker_session_.py b/...erregistry/client/v2_2/docker_session_.py → ...erregistry/client/v2_2/docker_session_.py
diff --git a/containerregistry/client/v2_2/oci_compat_.py → ...tainerregistry/client/v2_2/oci_compat_.py b/containerregistry/client/v2_2/oci_compat_.py → ...tainerregistry/client/v2_2/oci_compat_.py
diff --git a/containerregistry/client/v2_2/save_.py → ...ow/containerregistry/client/v2_2/save_.py b/containerregistry/client/v2_2/save_.py → ...ow/containerregistry/client/v2_2/save_.py
diff --git a/containerregistry/client/v2_2/v2_compat_.py → ...ntainerregistry/client/v2_2/v2_compat_.py b/containerregistry/client/v2_2/v2_compat_.py → ...ntainerregistry/client/v2_2/v2_compat_.py
diff --git a/containerregistry/transform/__init__.py → ...w/containerregistry/transform/__init__.py b/containerregistry/transform/__init__.py → ...w/containerregistry/transform/__init__.py
diff --git a/containerregistry/transform/v2_2/__init__.py → ...tainerregistry/transform/v2_2/__init__.py b/containerregistry/transform/v2_2/__init__.py → ...tainerregistry/transform/v2_2/__init__.py
diff --git a/...ainerregistry/transform/v2_2/metadata_.py → ...ainerregistry/transform/v2_2/metadata_.py b/...ainerregistry/transform/v2_2/metadata_.py → ...ainerregistry/transform/v2_2/metadata_.py
diff --git a/containerregistry/transport/__init__.py → ...w/containerregistry/transport/__init__.py b/containerregistry/transport/__init__.py → ...w/containerregistry/transport/__init__.py
diff --git a/containerregistry/transport/nested_.py → ...ow/containerregistry/transport/nested_.py b/containerregistry/transport/nested_.py → ...ow/containerregistry/transport/nested_.py
diff --git a/containerregistry/transport/retry_.py → ...low/containerregistry/transport/retry_.py b/containerregistry/transport/retry_.py → ...low/containerregistry/transport/retry_.py
diff --git a/...inerregistry/transport/transport_pool_.py → ...inerregistry/transport/transport_pool_.py b/...inerregistry/transport/transport_pool_.py → ...inerregistry/transport/transport_pool_.py
diff --git a/fairing/__init__.py → kubeflow/fairing/__init__.py b/fairing/__init__.py → kubeflow/fairing/__init__.py
@@ -2,10 +2,6 @@
 from .ml_tasks.tasks import TrainJob, PredictionEndpoint
 
 if os.getenv('FAIRING_RUNTIME', None) is not None:
-    from fairing.runtime_config import config
+    from .runtime_config import config
 else:
-    from fairing.config import config
-
-name = "fairing"
-
-__version__ = "0.5.3"
+    from .config import config
diff --git a/fairing/backends/__init__.py → kubeflow/fairing/backends/__init__.py b/fairing/backends/__init__.py → kubeflow/fairing/backends/__init__.py