file_conflict_resolved

selamw1 · selamw1 · commit f14a07f16cdb · 2024-12-03T15:53:28.000-08:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -62,6 +62,7 @@
     'JAX_time_series_classification.md',
     'JAX_transformer_text_classification.md',
     'data_loaders_on_cpu_with_jax.md',
+    'data_loaders_for_multi_device_setups_with_jax.md',
 ]
 
 suppress_warnings = [
@@ -98,4 +99,5 @@
     'JAX_time_series_classification.ipynb',
     'JAX_transformer_text_classification.ipynb',
     'data_loaders_on_cpu_with_jax.ipynb',
+    'data_loaders_for_multi_device_setups_with_jax.ipynb',
 ]
diff --git a/docs/tutorials.md b/docs/tutorials.md
@@ -22,6 +22,7 @@ JAX_image_captioning
 JAX_time_series_classification
 JAX_transformer_text_classification
 data_loaders_on_cpu_with_jax
+data_loaders_for_multi_device_setups_with_jax
 ```
 
 Once you've gone through this content, you can refer to package-specific

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`'JAX_time_series_classification.md',`
`63`	`63`	`'JAX_transformer_text_classification.md',`
`64`	`64`	`'data_loaders_on_cpu_with_jax.md',`
	`65`	`+ 'data_loaders_for_multi_device_setups_with_jax.md',`
`65`	`66`	`]`
`66`	`67`
`67`	`68`	`suppress_warnings = [`
`@@ -98,4 +99,5 @@`
`98`	`99`	`'JAX_time_series_classification.ipynb',`
`99`	`100`	`'JAX_transformer_text_classification.ipynb',`
`100`	`101`	`'data_loaders_on_cpu_with_jax.ipynb',`
	`102`	`+ 'data_loaders_for_multi_device_setups_with_jax.ipynb',`
`101`	`103`	`]`