Skip to content

Commit 626114b

Browse files
Adding the reverted changes back from #2110 (#2118)
* Revert "Revert " Add Mixtral,Qwen-Moe,Qwen,Xception API usage (#2101)" (#2110)" This reverts commit 715c864. * Update autogen.py * add keras-rs package
1 parent b437854 commit 626114b

File tree

3 files changed

+232
-5
lines changed

3 files changed

+232
-5
lines changed

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ keras-nlp
1616
keras-tuner
1717
tf-keras
1818
keras-hub
19-
# temporary path for KerasRS
20-
git+https://github.com/keras-team/keras-rs.git
19+
keras-rs

scripts/autogen.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@
3434
PROJECT_URL = {
3535
"keras": f"{KERAS_TEAM_GH}/keras/tree/v3.10.0/",
3636
"keras_tuner": f"{KERAS_TEAM_GH}/keras-tuner/tree/v1.4.7/",
37-
"keras_hub": f"{KERAS_TEAM_GH}/keras-hub/tree/v0.20.0/",
37+
"keras_hub": f"{KERAS_TEAM_GH}/keras-hub/tree/v0.21.1/",
3838
"tf_keras": f"{KERAS_TEAM_GH}/tf-keras/tree/v2.19.0/",
39-
# TODO: Use the correct version when we cut a release.
40-
"keras_rs": f"{KERAS_TEAM_GH}/keras-rs/tree/main/"
39+
"keras_rs": f"{KERAS_TEAM_GH}/keras-rs/tree/v0.2.1/"
4140
}
4241
USE_MULTIPROCESSING = False
4342

scripts/hub_master.py

Lines changed: 229 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,6 +1335,51 @@
13351335
},
13361336
],
13371337
},
1338+
{
1339+
"path": "mixtral/",
1340+
"title": "Mixtral",
1341+
"toc": True,
1342+
"children": [
1343+
{
1344+
"path": "mixtral_tokenizer",
1345+
"title": "MixtralTokenizer",
1346+
"generate": [
1347+
"keras_hub.tokenizers.MixtralTokenizer",
1348+
"keras_hub.tokenizers.MixtralTokenizer.from_preset",
1349+
],
1350+
},
1351+
{
1352+
"path": "mixtral_backbone",
1353+
"title": "MixtralBackbone model",
1354+
"generate": [
1355+
"keras_hub.models.MixtralBackbone",
1356+
"keras_hub.models.MixtralBackbone.from_preset",
1357+
"keras_hub.models.MixtralBackbone.token_embedding",
1358+
"keras_hub.models.MixtralBackbone.enable_lora",
1359+
],
1360+
},
1361+
{
1362+
"path": "mixtral_causal_lm",
1363+
"title": "MixtralCausalLM model",
1364+
"generate": [
1365+
"keras_hub.models.MixtralCausalLM",
1366+
"keras_hub.models.MixtralCausalLM.from_preset",
1367+
"keras_hub.models.MixtralCausalLM.generate",
1368+
"keras_hub.models.MixtralCausalLM.backbone",
1369+
"keras_hub.models.MixtralCausalLM.preprocessor",
1370+
],
1371+
},
1372+
{
1373+
"path": "mixtral_causal_lm_preprocessor",
1374+
"title": "MixtralCausalLMPreprocessor layer",
1375+
"generate": [
1376+
"keras_hub.models.MixtralCausalLMPreprocessor",
1377+
"keras_hub.models.MixtralCausalLMPreprocessor.from_preset",
1378+
"keras_hub.models.MixtralCausalLMPreprocessor.tokenizer",
1379+
],
1380+
},
1381+
],
1382+
},
13381383
{
13391384
"path": "mobilenet/",
13401385
"title": "MobileNet",
@@ -1377,6 +1422,58 @@
13771422
},
13781423
],
13791424
},
1425+
{
1426+
"path": "moonshine/",
1427+
"title": "Moonshine",
1428+
"toc": True,
1429+
"children": [
1430+
{
1431+
"path": "moonshine_tokenizer",
1432+
"title": "MoonshineTokenizer",
1433+
"generate": [
1434+
"keras_hub.tokenizers.MoonshineTokenizer",
1435+
"keras_hub.tokenizers.MoonshineTokenizer.from_preset",
1436+
],
1437+
},
1438+
{
1439+
"path": "moonshine_audio_converter",
1440+
"title": "MoonshineAudioConverter",
1441+
"generate": [
1442+
"keras_hub.layers.MoonshineAudioConverter",
1443+
"keras_hub.layers.MoonshineAudioConverter.from_preset",
1444+
],
1445+
},
1446+
{
1447+
"path": "moonshine_backbone",
1448+
"title": "MoonshineBackbone model",
1449+
"generate": [
1450+
"keras_hub.models.MoonshineBackbone",
1451+
"keras_hub.models.MoonshineBackbone.from_preset",
1452+
"keras_hub.models.MoonshineBackbone.token_embedding",
1453+
],
1454+
},
1455+
{
1456+
"path": "moonshine_audio_to_text",
1457+
"title": "MoonshineAudioToText model",
1458+
"generate": [
1459+
"keras_hub.models.MoonshineAudioToText",
1460+
"keras_hub.models.MoonshineAudioToText.from_preset",
1461+
"keras_hub.models.MoonshineAudioToText.generate",
1462+
"keras_hub.models.MoonshineAudioToText.backbone",
1463+
"keras_hub.models.MoonshineAudioToText.preprocessor",
1464+
],
1465+
},
1466+
{
1467+
"path": "moonshine_audio_to_text_preprocessor",
1468+
"title": "MoonshineAudioToTextPreprocessor layer",
1469+
"generate": [
1470+
"keras_hub.models.MoonshineAudioToTextPreprocessor",
1471+
"keras_hub.models.MoonshineAudioToTextPreprocessor.from_preset",
1472+
"keras_hub.models.MoonshineAudioToTextPreprocessor.tokenizer",
1473+
],
1474+
},
1475+
],
1476+
},
13801477
{
13811478
"path": "opt/",
13821479
"title": "OPT",
@@ -1509,6 +1606,96 @@
15091606
},
15101607
],
15111608
},
1609+
{
1610+
"path": "qwen/",
1611+
"title": "Qwen",
1612+
"toc": True,
1613+
"children": [
1614+
{
1615+
"path": "qwen_tokenizer",
1616+
"title": "QwenTokenizer",
1617+
"generate": [
1618+
"keras_hub.tokenizers.QwenTokenizer",
1619+
"keras_hub.tokenizers.QwenTokenizer.from_preset",
1620+
],
1621+
},
1622+
{
1623+
"path": "qwen_backbone",
1624+
"title": "QwenBackbone model",
1625+
"generate": [
1626+
"keras_hub.models.QwenBackbone",
1627+
"keras_hub.models.QwenBackbone.from_preset",
1628+
"keras_hub.models.QwenBackbone.token_embedding",
1629+
"keras_hub.models.QwenBackbone.enable_lora",
1630+
],
1631+
},
1632+
{
1633+
"path": "qwen_causal_lm",
1634+
"title": "QwenCausalLM model",
1635+
"generate": [
1636+
"keras_hub.models.QwenCausalLM",
1637+
"keras_hub.models.QwenCausalLM.from_preset",
1638+
"keras_hub.models.QwenCausalLM.generate",
1639+
"keras_hub.models.QwenCausalLM.backbone",
1640+
"keras_hub.models.QwenCausalLM.preprocessor",
1641+
],
1642+
},
1643+
{
1644+
"path": "qwen_causal_lm_preprocessor",
1645+
"title": "QwenCausalLMPreprocessor layer",
1646+
"generate": [
1647+
"keras_hub.models.QwenCausalLMPreprocessor",
1648+
"keras_hub.models.QwenCausalLMPreprocessor.from_preset",
1649+
"keras_hub.models.QwenCausalLMPreprocessor.tokenizer",
1650+
],
1651+
},
1652+
],
1653+
},
1654+
{
1655+
"path": "qwen_moe/",
1656+
"title": "QwenMoe",
1657+
"toc": True,
1658+
"children": [
1659+
{
1660+
"path": "qwen_moe_tokenizer",
1661+
"title": "QwenMoeTokenizer",
1662+
"generate": [
1663+
"keras_hub.tokenizers.QwenMoeTokenizer",
1664+
"keras_hub.tokenizers.QwenMoeTokenizer.from_preset",
1665+
],
1666+
},
1667+
{
1668+
"path": "qwen_moe_backbone",
1669+
"title": "QwenMoeBackbone model",
1670+
"generate": [
1671+
"keras_hub.models.QwenMoeBackbone",
1672+
"keras_hub.models.QwenMoeBackbone.from_preset",
1673+
"keras_hub.models.QwenMoeBackbone.token_embedding",
1674+
"keras_hub.models.QwenMoeBackbone.enable_lora",
1675+
],
1676+
},
1677+
{
1678+
"path": "qwen_moe_causal_lm",
1679+
"title": "QwenMoeCausalLM model",
1680+
"generate": [
1681+
"keras_hub.models.QwenMoeCausalLM",
1682+
"keras_hub.models.QwenMoeCausalLM.from_preset",
1683+
"keras_hub.models.QwenMoeCausalLM.generate",
1684+
"keras_hub.models.QwenMoeCausalLM.backbone",
1685+
"keras_hub.models.QwenMoeCausalLM.preprocessor",
1686+
],
1687+
},
1688+
{
1689+
"path": "qwen_moe_causal_lm_preprocessor",
1690+
"title": "QwenMoeCausalLMPreprocessor layer",
1691+
"generate": [
1692+
"keras_hub.models.QwenMoeCausalLMPreprocessor",
1693+
"keras_hub.models.QwenMoeCausalLMPreprocessor.from_preset",
1694+
"keras_hub.models.QwenMoeCausalLMPreprocessor.tokenizer",
1695+
],
1696+
},
1697+
],
1698+
},
15121699
{
15131700
"path": "resnet/",
15141701
"title": "ResNet",
@@ -2020,6 +2207,48 @@
20202207
},
20212208
],
20222209
},
2210+
{
2211+
"path": "xception/",
2212+
"title": "Xception",
2213+
"toc": True,
2214+
"children": [
2215+
{
2216+
"path": "xception_image_converter",
2217+
"title": "XceptionImageConverter",
2218+
"generate": [
2219+
"keras_hub.layers.XceptionImageConverter",
2220+
"keras_hub.layers.XceptionImageConverter.from_preset",
2221+
],
2222+
},
2223+
{
2224+
"path": "xception_backbone",
2225+
"title": "XceptionBackbone model",
2226+
"generate": [
2227+
"keras_hub.models.XceptionBackbone",
2228+
"keras_hub.models.XceptionBackbone.from_preset",
2229+
],
2230+
},
2231+
{
2232+
"path": "xception_image_classifier",
2233+
"title": "XceptionImageClassifier model",
2234+
"generate": [
2235+
"keras_hub.models.XceptionImageClassifier",
2236+
"keras_hub.models.XceptionImageClassifier.from_preset",
2237+
"keras_hub.models.XceptionImageClassifier.backbone",
2238+
"keras_hub.models.XceptionImageClassifier.preprocessor",
2239+
],
2240+
},
2241+
{
2242+
"path": "xception_image_classifier_preprocessor",
2243+
"title": "XceptionImageClassifierPreprocessor layer",
2244+
"generate": [
2245+
"keras_hub.models.XceptionImageClassifierPreprocessor",
2246+
"keras_hub.models.XceptionImageClassifierPreprocessor.from_preset",
2247+
"keras_hub.models.XceptionImageClassifierPreprocessor.image_converter",
2248+
],
2249+
},
2250+
],
2251+
},
20232252
{
20242253
"path": "xlnet/",
20252254
"title": "XLNet",

0 commit comments

Comments
 (0)