Skip to content

Commit

Permalink
Api gen
Browse files Browse the repository at this point in the history
  • Loading branch information
abuelnasr0 committed May 2, 2024
1 parent f7c5b92 commit 36682c7
Show file tree
Hide file tree
Showing 17 changed files with 82 additions and 63 deletions.
7 changes: 7 additions & 0 deletions keras_nlp/api/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@
)
from keras_nlp.src.models.opt.opt_preprocessor import OPTPreprocessor
from keras_nlp.src.models.opt.opt_tokenizer import OPTTokenizer
from keras_nlp.src.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.src.models.phi3.phi3_causal_lm import Phi3CausalLM
from keras_nlp.src.models.phi3.phi3_causal_lm_preprocessor import (
Phi3CausalLMPreprocessor,
)
from keras_nlp.src.models.phi3.phi3_preprocessor import Phi3Preprocessor
from keras_nlp.src.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.src.models.preprocessor import Preprocessor
from keras_nlp.src.models.roberta.roberta_backbone import RobertaBackbone
from keras_nlp.src.models.roberta.roberta_classifier import RobertaClassifier
Expand Down
7 changes: 7 additions & 0 deletions keras_nlp/src/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@
)
from keras_nlp.src.models.opt.opt_preprocessor import OPTPreprocessor
from keras_nlp.src.models.opt.opt_tokenizer import OPTTokenizer
from keras_nlp.src.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.src.models.phi3.phi3_causal_lm import Phi3CausalLM
from keras_nlp.src.models.phi3.phi3_causal_lm_preprocessor import (
Phi3CausalLMPreprocessor,
)
from keras_nlp.src.models.phi3.phi3_preprocessor import Phi3Preprocessor
from keras_nlp.src.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.src.models.preprocessor import Preprocessor
from keras_nlp.src.models.roberta.roberta_backbone import RobertaBackbone
from keras_nlp.src.models.roberta.roberta_classifier import RobertaClassifier
Expand Down
6 changes: 3 additions & 3 deletions keras_nlp/src/models/phi3/Phi3_preprocessor_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

import os

from keras_nlp.models.phi3.phi3_preprocessor import Phi3Preprocessor
from keras_nlp.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.tests.test_case import TestCase
from keras_nlp.src.models.phi3.phi3_preprocessor import Phi3Preprocessor
from keras_nlp.src.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.src.tests.test_case import TestCase


class Phi3PreprocessorTest(TestCase):
Expand Down
7 changes: 4 additions & 3 deletions keras_nlp/src/models/phi3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from keras_nlp.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.utils.preset_utils import register_presets
from keras_nlp.src.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.src.models.phi3.phi3_tokenizer import Phi3Tokenizer

# from keras_nlp.src.utils.preset_utils import register_presets

# register_presets(backbone_presets, (Phi3Backbone, Phi3Tokenizer))
10 changes: 5 additions & 5 deletions keras_nlp/src/models/phi3/phi3_attention.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from keras_nlp.backend import keras
from keras_nlp.backend import ops
from keras_nlp.layers.modeling.rotary_embedding import RotaryEmbedding
from keras_nlp.models.phi3.phi3_rotary_embedding import (
from keras_nlp.src.backend import keras
from keras_nlp.src.backend import ops
from keras_nlp.src.layers.modeling.rotary_embedding import RotaryEmbedding
from keras_nlp.src.models.phi3.phi3_rotary_embedding import (
Phi3SuScaledRotaryEmbedding,
)
from keras_nlp.utils.keras_utils import clone_initializer
from keras_nlp.src.utils.keras_utils import clone_initializer


class Phi3Attention(keras.layers.Layer):
Expand Down
14 changes: 8 additions & 6 deletions keras_nlp/src/models/phi3/phi3_backbone.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from keras_nlp.api_export import keras_nlp_export
from keras_nlp.backend import keras
from keras_nlp.layers.modeling.reversible_embedding import ReversibleEmbedding
from keras_nlp.models.backbone import Backbone
from keras_nlp.models.phi3.phi3_decoder import Phi3Decoder
from keras_nlp.models.phi3.phi3_layernorm import Phi3LayerNorm
from keras_nlp.src.api_export import keras_nlp_export
from keras_nlp.src.backend import keras
from keras_nlp.src.layers.modeling.reversible_embedding import (
ReversibleEmbedding,
)
from keras_nlp.src.models.backbone import Backbone
from keras_nlp.src.models.phi3.phi3_decoder import Phi3Decoder
from keras_nlp.src.models.phi3.phi3_layernorm import Phi3LayerNorm


def _phi3_kernel_initializer(stddev=0.02):
Expand Down
6 changes: 3 additions & 3 deletions keras_nlp/src/models/phi3/phi3_backbone_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# limitations under the License.
import pytest

from keras_nlp.backend import ops
from keras_nlp.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.tests.test_case import TestCase
from keras_nlp.src.backend import ops
from keras_nlp.src.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.src.tests.test_case import TestCase


class Phi3Test(TestCase):
Expand Down
14 changes: 7 additions & 7 deletions keras_nlp/src/models/phi3/phi3_causal_lm.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from keras_nlp.api_export import keras_nlp_export
from keras_nlp.backend import ops
from keras_nlp.models.causal_lm import CausalLM
from keras_nlp.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.models.phi3.phi3_causal_lm_preprocessor import (
from keras_nlp.src.api_export import keras_nlp_export
from keras_nlp.src.backend import ops
from keras_nlp.src.models.causal_lm import CausalLM
from keras_nlp.src.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.src.models.phi3.phi3_causal_lm_preprocessor import (
Phi3CausalLMPreprocessor,
)
from keras_nlp.utils.python_utils import classproperty
from keras_nlp.utils.tensor_utils import any_equal
from keras_nlp.src.utils.python_utils import classproperty
from keras_nlp.src.utils.tensor_utils import any_equal


@keras_nlp_export("keras_nlp.models.Phi3CausalLM")
Expand Down
10 changes: 5 additions & 5 deletions keras_nlp/src/models/phi3/phi3_causal_lm_preprocessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
)
from absl import logging

from keras_nlp.api_export import keras_nlp_export
from keras_nlp.backend import ops
from keras_nlp.models.phi3.phi3_preprocessor import Phi3Preprocessor
from keras_nlp.utils.keras_utils import (
from keras_nlp.src.api_export import keras_nlp_export
from keras_nlp.src.backend import ops
from keras_nlp.src.models.phi3.phi3_preprocessor import Phi3Preprocessor
from keras_nlp.src.utils.keras_utils import (
convert_inputs_to_list_of_tensor_segments,
)
from keras_nlp.utils.keras_utils import pack_x_y_sample_weight
from keras_nlp.src.utils.keras_utils import pack_x_y_sample_weight


@keras_nlp_export("keras_nlp.models.Phi3CausalLMPreprocessor")
Expand Down
6 changes: 3 additions & 3 deletions keras_nlp/src/models/phi3/phi3_causal_lm_preprocessor_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

import os

from keras_nlp.models.phi3.phi3_causal_lm_preprocessor import (
from keras_nlp.src.models.phi3.phi3_causal_lm_preprocessor import (
Phi3CausalLMPreprocessor,
)
from keras_nlp.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.tests.test_case import TestCase
from keras_nlp.src.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.src.tests.test_case import TestCase


class Phi3CausalLMPreprocessorTest(TestCase):
Expand Down
12 changes: 6 additions & 6 deletions keras_nlp/src/models/phi3/phi3_causal_lm_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
import os
from unittest.mock import patch

from keras_nlp.backend import ops
from keras_nlp.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.models.phi3.phi3_causal_lm import Phi3CausalLM
from keras_nlp.models.phi3.phi3_causal_lm_preprocessor import (
from keras_nlp.src.backend import ops
from keras_nlp.src.models.phi3.phi3_backbone import Phi3Backbone
from keras_nlp.src.models.phi3.phi3_causal_lm import Phi3CausalLM
from keras_nlp.src.models.phi3.phi3_causal_lm_preprocessor import (
Phi3CausalLMPreprocessor,
)
from keras_nlp.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.tests.test_case import TestCase
from keras_nlp.src.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.src.tests.test_case import TestCase

# import pytest

Expand Down
14 changes: 7 additions & 7 deletions keras_nlp/src/models/phi3/phi3_decoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from keras_nlp.backend import keras
from keras_nlp.backend import ops
from keras_nlp.layers.modeling.transformer_layer_utils import (
from keras_nlp.src.backend import keras
from keras_nlp.src.backend import ops
from keras_nlp.src.layers.modeling.transformer_layer_utils import (
compute_causal_mask,
)
from keras_nlp.layers.modeling.transformer_layer_utils import (
from keras_nlp.src.layers.modeling.transformer_layer_utils import (
merge_padding_and_attention_mask,
)
from keras_nlp.models.phi3.phi3_attention import Phi3Attention
from keras_nlp.models.phi3.phi3_layernorm import Phi3LayerNorm
from keras_nlp.utils.keras_utils import clone_initializer
from keras_nlp.src.models.phi3.phi3_attention import Phi3Attention
from keras_nlp.src.models.phi3.phi3_layernorm import Phi3LayerNorm
from keras_nlp.src.utils.keras_utils import clone_initializer


class Phi3Decoder(keras.layers.Layer):
Expand Down
4 changes: 2 additions & 2 deletions keras_nlp/src/models/phi3/phi3_layernorm.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from keras_nlp.backend import keras
from keras_nlp.backend import ops
from keras_nlp.src.backend import keras
from keras_nlp.src.backend import ops


# TODO: Deprecate this in favor of
Expand Down
12 changes: 6 additions & 6 deletions keras_nlp/src/models/phi3/phi3_preprocessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from keras_nlp.api_export import keras_nlp_export
from keras_nlp.layers.preprocessing.start_end_packer import StartEndPacker
from keras_nlp.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.models.preprocessor import Preprocessor
from keras_nlp.utils.keras_utils import (
from keras_nlp.src.api_export import keras_nlp_export
from keras_nlp.src.layers.preprocessing.start_end_packer import StartEndPacker
from keras_nlp.src.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.src.models.preprocessor import Preprocessor
from keras_nlp.src.utils.keras_utils import (
convert_inputs_to_list_of_tensor_segments,
)
from keras_nlp.utils.keras_utils import pack_x_y_sample_weight
from keras_nlp.src.utils.keras_utils import pack_x_y_sample_weight


@keras_nlp_export("keras_nlp.models.Phi3Preprocessor")
Expand Down
4 changes: 2 additions & 2 deletions keras_nlp/src/models/phi3/phi3_rotary_embedding.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.
import math

from keras_nlp.backend import ops
from keras_nlp.layers.modeling.rotary_embedding import RotaryEmbedding
from keras_nlp.src.backend import ops
from keras_nlp.src.layers.modeling.rotary_embedding import RotaryEmbedding


class Phi3SuScaledRotaryEmbedding(RotaryEmbedding):
Expand Down
8 changes: 5 additions & 3 deletions keras_nlp/src/models/phi3/phi3_tokenizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from keras_nlp.api_export import keras_nlp_export
from keras_nlp.tokenizers.sentence_piece_tokenizer import SentencePieceTokenizer
from keras_nlp.src.api_export import keras_nlp_export
from keras_nlp.src.tokenizers.sentence_piece_tokenizer import (
SentencePieceTokenizer,
)


@keras_nlp_export("keras_nlp.models.Phi3Tokenizer")
Expand Down Expand Up @@ -62,7 +64,7 @@ def __init__(self, proto, **kwargs):
self.start_token = "<s>"
self.end_token = "<|endoftext|>"
# TODO: `pad_token` is `<|endoftext|>`, but setting it to `</s>` for
# now, because of the way sampler work. sampler will think that
# now, because of the way sampler work. sampler will think that
# `pad_token` is `end_token` and stop generation immediatly.
self.pad_token = "</s>"

Expand Down
4 changes: 2 additions & 2 deletions keras_nlp/src/models/phi3/phi3_tokenizer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

import os

from keras_nlp.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.tests.test_case import TestCase
from keras_nlp.src.models.phi3.phi3_tokenizer import Phi3Tokenizer
from keras_nlp.src.tests.test_case import TestCase


class Phi3TokenizerTest(TestCase):
Expand Down

0 comments on commit 36682c7

Please sign in to comment.