Fix a few more :)

fsschneider · fsschneider · commit a10653702b34 · 2025-07-09T12:30:38.000+02:00
diff --git a/algorithms/target_setting_algorithms/jax_adamw.py b/algorithms/target_setting_algorithms/jax_adamw.py
@@ -6,14 +6,14 @@
 from flax import jax_utils
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms import cosine_warmup
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms import cosine_warmup
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
+from algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
   get_batch_size,
 )
-from reference_algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/algorithms/target_setting_algorithms/jax_momentum.py b/algorithms/target_setting_algorithms/jax_momentum.py
@@ -8,13 +8,13 @@
 from flax import jax_utils
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
+from algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
   get_batch_size,
 )
-from reference_algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/algorithms/target_setting_algorithms/jax_nadamw.py b/algorithms/target_setting_algorithms/jax_nadamw.py
@@ -9,14 +9,14 @@
 from flax import jax_utils
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms import cosine_warmup
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms import cosine_warmup
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
+from algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
   get_batch_size,
 )
-from reference_algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/algorithms/target_setting_algorithms/jax_nesterov.py b/algorithms/target_setting_algorithms/jax_nesterov.py
@@ -8,13 +8,13 @@
 from flax import jax_utils
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
+from algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
   get_batch_size,
 )
-from reference_algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/algorithms/target_setting_algorithms/pytorch_adamw.py b/algorithms/target_setting_algorithms/pytorch_adamw.py
@@ -3,14 +3,14 @@
 import torch
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms import cosine_warmup
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms import cosine_warmup
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
+from algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
   get_batch_size,
 )
-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/algorithms/target_setting_algorithms/pytorch_momentum.py b/algorithms/target_setting_algorithms/pytorch_momentum.py
@@ -4,16 +4,16 @@
 from torch.optim.lr_scheduler import LambdaLR
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
+from algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
   get_batch_size,
 )
-from reference_algorithms.target_setting_algorithms.jax_momentum import (
+from algorithms.target_setting_algorithms.jax_momentum import (
   create_lr_schedule_fn,
 )
-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/algorithms/target_setting_algorithms/pytorch_nadamw.py b/algorithms/target_setting_algorithms/pytorch_nadamw.py
@@ -7,14 +7,14 @@
 from torch import Tensor
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms import cosine_warmup
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms import cosine_warmup
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
+from algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
   get_batch_size,
 )
-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/algorithms/target_setting_algorithms/pytorch_nesterov.py b/algorithms/target_setting_algorithms/pytorch_nesterov.py
@@ -4,16 +4,16 @@
 from torch.optim.lr_scheduler import LambdaLR
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
+from algorithms.target_setting_algorithms.get_batch_size import (  # noqa: F401
   get_batch_size,
 )
-from reference_algorithms.target_setting_algorithms.jax_momentum import (
+from algorithms.target_setting_algorithms.jax_momentum import (
   create_lr_schedule_fn,
 )
-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/tests/modeldiffs/vanilla_sgd_jax.py b/tests/modeldiffs/vanilla_sgd_jax.py
@@ -4,10 +4,10 @@
 from flax import jax_utils
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.jax_submission_base import (  # noqa: F401
   update_params,
 )
 
diff --git a/tests/modeldiffs/vanilla_sgd_pytorch.py b/tests/modeldiffs/vanilla_sgd_pytorch.py
@@ -1,10 +1,10 @@
 import torch
 
 from algoperf import spec
-from reference_algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
+from algorithms.target_setting_algorithms.data_selection import (  # noqa: F401
   data_selection,
 )
-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
+from algorithms.target_setting_algorithms.pytorch_submission_base import (  # noqa: F401
   update_params,
 )
 

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@`
`6`	`6`	`from flax import jax_utils`
`7`	`7`
`8`	`8`	`from algoperf import spec`
`9`		`-from reference_algorithms.target_setting_algorithms import cosine_warmup`
`10`		`-from reference_algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
	`9`	`+from algorithms.target_setting_algorithms import cosine_warmup`
	`10`	`+from algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
`11`	`11`	`data_selection,`
`12`	`12`	`)`
`13`		`-from reference_algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
	`13`	`+from algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
`14`	`14`	`get_batch_size,`
`15`	`15`	`)`
`16`		`-from reference_algorithms.target_setting_algorithms.jax_submission_base import ( # noqa: F401`
	`16`	`+from algorithms.target_setting_algorithms.jax_submission_base import ( # noqa: F401`
`17`	`17`	`update_params,`
`18`	`18`	`)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@`
`8`	`8`	`from flax import jax_utils`
`9`	`9`
`10`	`10`	`from algoperf import spec`
`11`		`-from reference_algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
	`11`	`+from algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
`12`	`12`	`data_selection,`
`13`	`13`	`)`
`14`		`-from reference_algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
	`14`	`+from algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
`15`	`15`	`get_batch_size,`
`16`	`16`	`)`
`17`		`-from reference_algorithms.target_setting_algorithms.jax_submission_base import ( # noqa: F401`
	`17`	`+from algorithms.target_setting_algorithms.jax_submission_base import ( # noqa: F401`
`18`	`18`	`update_params,`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@`
`9`	`9`	`from flax import jax_utils`
`10`	`10`
`11`	`11`	`from algoperf import spec`
`12`		`-from reference_algorithms.target_setting_algorithms import cosine_warmup`
`13`		`-from reference_algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
	`12`	`+from algorithms.target_setting_algorithms import cosine_warmup`
	`13`	`+from algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
`14`	`14`	`data_selection,`
`15`	`15`	`)`
`16`		`-from reference_algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
	`16`	`+from algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
`17`	`17`	`get_batch_size,`
`18`	`18`	`)`
`19`		`-from reference_algorithms.target_setting_algorithms.jax_submission_base import ( # noqa: F401`
	`19`	`+from algorithms.target_setting_algorithms.jax_submission_base import ( # noqa: F401`
`20`	`20`	`update_params,`
`21`	`21`	`)`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@`
`3`	`3`	`import torch`
`4`	`4`
`5`	`5`	`from algoperf import spec`
`6`		`-from reference_algorithms.target_setting_algorithms import cosine_warmup`
`7`		`-from reference_algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
	`6`	`+from algorithms.target_setting_algorithms import cosine_warmup`
	`7`	`+from algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
`8`	`8`	`data_selection,`
`9`	`9`	`)`
`10`		`-from reference_algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
	`10`	`+from algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
`11`	`11`	`get_batch_size,`
`12`	`12`	`)`
`13`		`-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import ( # noqa: F401`
	`13`	`+from algorithms.target_setting_algorithms.pytorch_submission_base import ( # noqa: F401`
`14`	`14`	`update_params,`
`15`	`15`	`)`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,16 @@`
`4`	`4`	`from torch.optim.lr_scheduler import LambdaLR`
`5`	`5`
`6`	`6`	`from algoperf import spec`
`7`		`-from reference_algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
	`7`	`+from algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
`8`	`8`	`data_selection,`
`9`	`9`	`)`
`10`		`-from reference_algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
	`10`	`+from algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
`11`	`11`	`get_batch_size,`
`12`	`12`	`)`
`13`		`-from reference_algorithms.target_setting_algorithms.jax_momentum import (`
	`13`	`+from algorithms.target_setting_algorithms.jax_momentum import (`
`14`	`14`	`create_lr_schedule_fn,`
`15`	`15`	`)`
`16`		`-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import ( # noqa: F401`
	`16`	`+from algorithms.target_setting_algorithms.pytorch_submission_base import ( # noqa: F401`
`17`	`17`	`update_params,`
`18`	`18`	`)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@`
`7`	`7`	`from torch import Tensor`
`8`	`8`
`9`	`9`	`from algoperf import spec`
`10`		`-from reference_algorithms.target_setting_algorithms import cosine_warmup`
`11`		`-from reference_algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
	`10`	`+from algorithms.target_setting_algorithms import cosine_warmup`
	`11`	`+from algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
`12`	`12`	`data_selection,`
`13`	`13`	`)`
`14`		`-from reference_algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
	`14`	`+from algorithms.target_setting_algorithms.get_batch_size import ( # noqa: F401`
`15`	`15`	`get_batch_size,`
`16`	`16`	`)`
`17`		`-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import ( # noqa: F401`
	`17`	`+from algorithms.target_setting_algorithms.pytorch_submission_base import ( # noqa: F401`
`18`	`18`	`update_params,`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`	`from flax import jax_utils`
`5`	`5`
`6`	`6`	`from algoperf import spec`
`7`		`-from reference_algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
	`7`	`+from algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
`8`	`8`	`data_selection,`
`9`	`9`	`)`
`10`		`-from reference_algorithms.target_setting_algorithms.jax_submission_base import ( # noqa: F401`
	`10`	`+from algorithms.target_setting_algorithms.jax_submission_base import ( # noqa: F401`
`11`	`11`	`update_params,`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`import torch`
`2`	`2`
`3`	`3`	`from algoperf import spec`
`4`		`-from reference_algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
	`4`	`+from algorithms.target_setting_algorithms.data_selection import ( # noqa: F401`
`5`	`5`	`data_selection,`
`6`	`6`	`)`
`7`		`-from reference_algorithms.target_setting_algorithms.pytorch_submission_base import ( # noqa: F401`
	`7`	`+from algorithms.target_setting_algorithms.pytorch_submission_base import ( # noqa: F401`
`8`	`8`	`update_params,`
`9`	`9`	`)`
`10`	`10`