move everything into hydra_plugins

Kapoorlabs-paris · Jan 19, 2022 · 2ec13ab · 2ec13ab
1 parent 00717f0
commit 2ec13ab
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
 global-exclude *.pyc
 global-exclude __pycache__
-recursive-include jz_hydra_submitit_launcher/* *.yaml
+recursive-include hydra_plugins/* *.yaml
diff --git a/jz_hydra_submitit_launcher/__init__.py → ...ns/jz_hydra_submitit_launcher/__init__.py b/jz_hydra_submitit_launcher/__init__.py → ...ns/jz_hydra_submitit_launcher/__init__.py
diff --git a/...bmitit_launcher/bin/hydra-submitit-launch → ...bmitit_launcher/bin/hydra-submitit-launch b/...bmitit_launcher/bin/hydra-submitit-launch → ...bmitit_launcher/bin/hydra-submitit-launch
diff --git a/...it_launcher/hydra/launcher/4gpus_dev.yaml → ...it_launcher/hydra/launcher/4gpus_dev.yaml b/...it_launcher/hydra/launcher/4gpus_dev.yaml → ...it_launcher/hydra/launcher/4gpus_dev.yaml
diff --git a/...tit_launcher/hydra/launcher/4gpus_t3.yaml → ...tit_launcher/hydra/launcher/4gpus_t3.yaml b/...tit_launcher/hydra/launcher/4gpus_t3.yaml → ...tit_launcher/hydra/launcher/4gpus_t3.yaml
diff --git a/...tit_launcher/hydra/launcher/4gpus_t4.yaml → ...tit_launcher/hydra/launcher/4gpus_t4.yaml b/...tit_launcher/hydra/launcher/4gpus_t4.yaml → ...tit_launcher/hydra/launcher/4gpus_t4.yaml
diff --git a/...ubmitit_launcher/hydra/launcher/base.yaml → ...ubmitit_launcher/hydra/launcher/base.yaml b/...ubmitit_launcher/hydra/launcher/base.yaml → ...ubmitit_launcher/hydra/launcher/base.yaml
diff --git a/...submitit_launcher/hydra/launcher/dev.yaml → ...submitit_launcher/hydra/launcher/dev.yaml b/...submitit_launcher/hydra/launcher/dev.yaml → ...submitit_launcher/hydra/launcher/dev.yaml
diff --git a/..._submitit_launcher/hydra/launcher/t3.yaml → ..._submitit_launcher/hydra/launcher/t3.yaml b/..._submitit_launcher/hydra/launcher/t3.yaml → ..._submitit_launcher/hydra/launcher/t3.yaml
diff --git a/..._submitit_launcher/hydra/launcher/t4.yaml → ..._submitit_launcher/hydra/launcher/t4.yaml b/..._submitit_launcher/hydra/launcher/t4.yaml → ..._submitit_launcher/hydra/launcher/t4.yaml
diff --git a/hydra_plugins/jz_hydra_submitit_launcher/resolvers.py b/hydra_plugins/jz_hydra_submitit_launcher/resolvers.py
@@ -0,0 +1,3 @@
+from omegaconf import OmegaConf
+
+OmegaConf.register_new_resolver("multiply10", lambda x: x * 10)
diff --git a/...itit_launcher_plugin/searchpath_config.py → ...ra_submitit_launcher/searchpath_config.py b/...itit_launcher_plugin/searchpath_config.py → ...ra_submitit_launcher/searchpath_config.py
@@ -12,5 +12,5 @@ def manipulate_search_path(self, search_path: ConfigSearchPath) -> None:
         # Remember to verify the config is packaged properly (build sdist and look inside,
         # and verify MANIFEST.in is correct).
         search_path.append(
-            provider="jz-hydra-submitit-launcher", path="pkg://jz_hydra_submitit_launcher"
+            provider="jz-hydra-submitit-launcher", path="pkg://hydra_plugins.jz_hydra_submitit_launcher"
         )
diff --git a/hydra_plugins/jz_hydra_submitit_launcher_plugin/__init__.py b/hydra_plugins/jz_hydra_submitit_launcher_plugin/__init__.py
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 with open('requirements.txt') as open_file:
     install_requires = open_file.read()
 
-import jz_hydra_submitit_launcher
+from hydra_plugins import jz_hydra_submitit_launcher
 
 setuptools.setup(
     name="jz-hydra-submitit-launcher",
@@ -31,5 +31,5 @@
     python_requires='>=3.6',
     include_package_data=True,
     keywords=['hydra', 'submitit', 'jean-zay'],
-    scripts=['jz_hydra_submitit_launcher/bin/hydra-submitit-launch'],
+    scripts=['hydra_plugins/jz_hydra_submitit_launcher/bin/hydra-submitit-launch'],
 )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from omegaconf import OmegaConf

		OmegaConf.register_new_resolver("multiply10", lambda x: x * 10)