Skip to content

Commit 42ec065

Browse files
Merge pull request #3205 from AI-Hypercomputer:move-maxtext-common
PiperOrigin-RevId: 874806284
2 parents 973d8e1 + cb41d86 commit 42ec065

77 files changed

Lines changed: 104 additions & 105 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/MaxText/generate_param_only_checkpoint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from MaxText import optimizers
3333
from MaxText import pyconfig
3434
from maxtext.common import checkpointing
35-
from MaxText.common_types import DecoderBlockType, MODEL_MODE_TRAIN
35+
from maxtext.common.common_types import DecoderBlockType, MODEL_MODE_TRAIN
3636
from maxtext.layers import quantizations
3737
from maxtext.models import models
3838
from maxtext.utils import gcs_utils

src/MaxText/gradient_accumulation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import jax.numpy as jnp
1919
from jax.sharding import NamedSharding
2020

21-
from MaxText.common_types import ShardMode
21+
from maxtext.common.common_types import ShardMode
2222
from MaxText.sharding import maybe_shard_with_name
2323

2424

src/MaxText/layerwise_quantization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
from flax.linen import partitioning as nn_partitioning
4040
import jax
4141
import jax.numpy as jnp
42-
from MaxText import common_types
43-
from MaxText import pyconfig
42+
from maxtext.common import common_types
4443
from maxtext.common import checkpointing
4544
from maxtext.layers import quantizations
4645
from maxtext.models import deepseek, models
@@ -49,6 +48,7 @@
4948
from maxtext.utils import maxtext_utils
5049
import orbax.checkpoint as ocp
5150
from tqdm import tqdm
51+
from MaxText import pyconfig
5252

5353
IGNORE = ocp.PLACEHOLDER
5454
PRNGKeyType = Any

src/MaxText/pyconfig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import omegaconf
3030

3131
from MaxText import pyconfig_deprecated
32-
from MaxText.common_types import DecoderBlockType, ShardMode
3332
from MaxText.globals import MAXTEXT_CONFIGS_DIR
33+
from maxtext.common.common_types import DecoderBlockType, ShardMode
3434
from maxtext.configs import types
3535
from maxtext.configs.types import MaxTextConfig
3636
from maxtext.inference.inference_utils import str2bool

src/MaxText/pyconfig_deprecated.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from MaxText import accelerator_to_spec_map
3232
from MaxText.globals import MAXTEXT_ASSETS_ROOT, MAXTEXT_REPO_ROOT, MAXTEXT_PKG_DIR
33-
from MaxText.common_types import AttentionType, DecoderBlockType, ShardMode
33+
from maxtext.common.common_types import AttentionType, DecoderBlockType, ShardMode
3434
from maxtext.utils import gcs_utils
3535
from maxtext.utils import max_logging
3636
from maxtext.utils import max_utils

src/MaxText/sharding.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import optax
2727

28-
from MaxText.common_types import ShardMode
28+
from maxtext.common.common_types import ShardMode
2929
from maxtext.utils import max_logging
3030
from maxtext.utils import max_utils
3131

src/MaxText/vocabulary_tiling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
all_gather_over_fsdp,
2626
create_sharding,
2727
)
28-
from MaxText.common_types import ShardMode
28+
from maxtext.common.common_types import ShardMode
2929
from maxtext.utils import max_utils
3030

3131

src/maxtext/checkpoint_conversion/standalone_scripts/convert_gpt3_ckpt_from_paxml.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
from jax.sharding import Mesh
4545
from MaxText import optimizers
4646
from MaxText import pyconfig
47-
from maxtext.common import checkpointing
48-
from MaxText.common_types import MODEL_MODE_TRAIN
4947
from MaxText.globals import MAXTEXT_PKG_DIR
48+
from maxtext.common import checkpointing
49+
from maxtext.common.common_types import MODEL_MODE_TRAIN
5050
from maxtext.layers import quantizations
5151
from maxtext.models.models import transformer_as_linen
5252
from maxtext.utils import max_logging

src/maxtext/checkpoint_conversion/to_maxtext.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
from huggingface_hub import hf_hub_download, list_repo_files
7272
import jax
7373
from MaxText import pyconfig
74-
from MaxText.common_types import MODEL_MODE_TRAIN
74+
from maxtext.common.common_types import MODEL_MODE_TRAIN
7575
from maxtext.checkpoint_conversion.standalone_scripts.llama_or_mistral_ckpt import save_weights_to_checkpoint
7676
from maxtext.checkpoint_conversion.utils.param_mapping import HOOK_FNS, PARAM_MAPPING
7777
from maxtext.checkpoint_conversion.utils.utils import HF_IDS, MemoryMonitorTqdm, apply_hook_fns, get_hf_model, print_peak_memory, print_ram_usage, validate_and_filter_param_map_keys
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023–2025 Google LLC
1+
# Copyright 2023–2026 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)