Skip to content

Commit 2ca8f28

Browse files
authored
Merge branch 'tensorflow:master' into wake_vision
2 parents 4e30dc8 + 76c967f commit 2ca8f28

File tree

265 files changed

+5812
-1660
lines changed

Some content is hidden

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

265 files changed

+5812
-1660
lines changed

.github/actions/setup/action.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ inputs:
1414
description: 'Extra dependencies'
1515
required: false
1616
default: 'tests-all'
17+
use-cache:
18+
description: 'Use cache'
19+
required: false
20+
default: 'true'
1721

1822
runs:
1923
using: 'composite'
@@ -51,13 +55,18 @@ runs:
5155
- name: Store inputs for identifying Python cache
5256
run: echo "${{ env.today }}-${{ inputs.extras }}" >> python-cache-keys.txt
5357
shell: bash
54-
- uses: actions/setup-python@v5
58+
- if: ${{ inputs.use-cache == 'true' }}
59+
uses: actions/setup-python@v5
5560
with:
5661
python-version: ${{ inputs.python-version }}
5762
cache: 'pip'
5863
cache-dependency-path: |
5964
setup.py
6065
python-cache-keys.txt
66+
- if: ${{ inputs.use-cache == 'false' }}
67+
uses: actions/setup-python@v5
68+
with:
69+
python-version: ${{ inputs.python-version }}
6170

6271
# Install Python deps.
6372
# If Python cache is restored then we don't need to install dependencies again.
@@ -70,12 +79,12 @@ runs:
7079
# Get TFDS library from the repository instead of cache.
7180
- run: echo "PYTHONPATH=$(pwd)" >> $GITHUB_ENV
7281
shell: bash
73-
# Get mlcroissant from the repository to get the latest features.
82+
# Get mlcroissant from PyPI to fix the version.
7483
- if: ${{ runner.os == 'Linux' }}
7584
run: sudo apt-get install -y libgraphviz-dev
7685
shell: bash
7786
- if: ${{ runner.os == 'macOS' }}
7887
run: brew install graphviz
7988
shell: bash
80-
- run: pip install mlcroissant==1.0.1
89+
- run: pip install mlcroissant==1.0.5
8190
shell: bash

.github/workflows/pytest.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ jobs:
7979
# Do not cancel in-progress jobs if any matrix job fails.
8080
fail-fast: false
8181
matrix:
82-
tf-version: ['tensorflow', 'tf-nightly']
82+
tf-version: ['tensorflow']
8383
# Can't reference env variables in matrix
8484
num-shards: ${{ fromJson(needs.shards-job.outputs.num-shards) }}
8585
shard-id: ${{ fromJson(needs.shards-job.outputs.shard-ids) }}
8686
# TF suppported versions: https://www.tensorflow.org/install/pip#software_requirements
87-
python-version: ['3.10', '3.11']
88-
os-version: [ubuntu-latest, macos-latest]
87+
python-version: ['3.10', '3.11', '3.12']
88+
os-version: [ubuntu-latest]
8989

9090
steps:
9191
- uses: actions/checkout@v3
@@ -185,8 +185,7 @@ jobs:
185185
- uses: ./.github/actions/setup
186186
with:
187187
tf-version: tensorflow
188-
189-
- run: pip install ipython
188+
use-cache: false
190189

191190
# Test each notebook sequentially.
192191
- name: Run notebook
@@ -202,6 +201,7 @@ jobs:
202201
--ExecutePreprocessor.timeout=600 \
203202
--ExecutePreprocessor.kernel_name=tfds-notebook \
204203
--to notebook \
205-
--execute $notebook
204+
--execute $notebook && \
205+
pip install tensorflow # reinstall tensorflow if it was uninstalled
206206
fi
207207
done

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,26 @@ and this project adheres to
1010

1111
### Added
1212

13+
### Changed
14+
15+
### Deprecated
16+
17+
### Removed
18+
19+
### Fixed
20+
21+
### Security
22+
23+
## [4.9.6] - 2024-06-04
24+
25+
### Added
26+
27+
- Full support for Python 3.12.
28+
29+
## [4.9.5] - 2024-05-30
30+
31+
### Added
32+
1333
- Support to download and prepare datasets using the
1434
[Parquet](https://parquet.apache.org) data format.
1535
```python
@@ -19,6 +39,16 @@ and this project adheres to
1939
print(next(iter(ds)))
2040
```
2141

42+
- [`tfds.data_source`](https://www.tensorflow.org/datasets/api_docs/python/tfds/data_source)
43+
is pickable, thus working smoothly with
44+
[PyGrain](https://github.com/google/grain). Learn more by following the
45+
[tutorial](https://www.tensorflow.org/datasets/data_source).
46+
47+
- TFDS plays nicely with
48+
[Croissant](https://mlcommons.org/working-groups/croissant). Learn more by
49+
following the
50+
[recipe](https://colab.research.google.com/github/mlcommons/croissant/blob/main/python/mlcroissant/recipes/tfds_croissant_builder.ipynb).
51+
2252
### Changed
2353

2454
### Deprecated

docs/catalog/_toc.yaml

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ toc:
3333
- path: /datasets/catalog/scientific_papers
3434
title: scientific_papers
3535
title: Abstractive text summarization
36+
- section:
37+
- path: /datasets/catalog/dices
38+
title: dices
39+
title: Age
3640
- section:
3741
- path: /datasets/catalog/ag_news_subset
3842
title: ag_news_subset
@@ -96,6 +100,8 @@ toc:
96100
title: ogbg_molpcba
97101
title: Biology
98102
- section:
103+
- path: /datasets/catalog/dices
104+
title: dices
99105
- path: /datasets/catalog/sift1m
100106
title: sift1m
101107
title: Categorical
@@ -170,6 +176,8 @@ toc:
170176
title: bot_adversarial_dialogue
171177
- path: /datasets/catalog/databricks_dolly
172178
title: databricks_dolly
179+
- path: /datasets/catalog/dices
180+
title: dices
173181
title: Dialogue
174182
- section:
175183
- path: /datasets/catalog/aeslc
@@ -195,6 +203,10 @@ toc:
195203
- path: /datasets/catalog/sun397
196204
title: sun397
197205
title: Fine grained image classification
206+
- section:
207+
- path: /datasets/catalog/dices
208+
title: dices
209+
title: Gender
198210
- section:
199211
- path: /datasets/catalog/ogbg_molpcba
200212
title: ogbg_molpcba
@@ -570,6 +582,8 @@ toc:
570582
title: blimp
571583
- path: /datasets/catalog/databricks_dolly
572584
title: databricks_dolly
585+
- path: /datasets/catalog/dices
586+
title: dices
573587
- path: /datasets/catalog/e2e_cleaned
574588
title: e2e_cleaned
575589
- path: /datasets/catalog/irc_disentanglement
@@ -626,6 +640,8 @@ toc:
626640
title: bool_q
627641
- path: /datasets/catalog/bot_adversarial_dialogue
628642
title: bot_adversarial_dialogue
643+
- path: /datasets/catalog/dices
644+
title: dices
629645
- path: /datasets/catalog/e2e_cleaned
630646
title: e2e_cleaned
631647
- path: /datasets/catalog/imdb_reviews
@@ -706,6 +722,8 @@ toc:
706722
- section:
707723
- path: /datasets/catalog/anli
708724
title: anli
725+
- path: /datasets/catalog/dices
726+
title: dices
709727
- path: /datasets/catalog/paws_wiki
710728
title: paws_wiki
711729
- path: /datasets/catalog/sci_tail
@@ -726,6 +744,8 @@ toc:
726744
title: clevr
727745
- path: /datasets/catalog/databricks_dolly
728746
title: databricks_dolly
747+
- path: /datasets/catalog/dices
748+
title: dices
729749
- path: /datasets/catalog/imdb_reviews
730750
title: imdb_reviews
731751
- path: /datasets/catalog/math_dataset
@@ -869,6 +889,10 @@ toc:
869889
- path: /datasets/catalog/trivia_qa
870890
title: trivia_qa
871891
title: Question generation
892+
- section:
893+
- path: /datasets/catalog/dices
894+
title: dices
895+
title: Race national ethnic origin
872896
- section:
873897
- path: /datasets/catalog/istella
874898
title: istella
@@ -942,6 +966,8 @@ toc:
942966
title: robosuite_panda_pick_place_can
943967
title: Rlds
944968
- section:
969+
- path: /datasets/catalog/aloha_mobile
970+
title: aloha_mobile
945971
- path: /datasets/catalog/asu_table_top_converted_externally_to_rlds
946972
title: asu_table_top_converted_externally_to_rlds
947973
- path: /datasets/catalog/austin_buds_dataset_converted_externally_to_rlds
@@ -970,6 +996,8 @@ toc:
970996
title: berkeley_rpt_converted_externally_to_rlds
971997
- path: /datasets/catalog/bridge
972998
title: bridge
999+
- path: /datasets/catalog/bridge_data_msr
1000+
title: bridge_data_msr
9731001
- path: /datasets/catalog/cmu_franka_exploration_dataset_converted_externally_to_rlds
9741002
title: cmu_franka_exploration_dataset_converted_externally_to_rlds
9751003
- path: /datasets/catalog/cmu_play_fusion
@@ -978,20 +1006,28 @@ toc:
9781006
title: cmu_stretch
9791007
- path: /datasets/catalog/columbia_cairlab_pusht_real
9801008
title: columbia_cairlab_pusht_real
1009+
- path: /datasets/catalog/conq_hose_manipulation
1010+
title: conq_hose_manipulation
9811011
- path: /datasets/catalog/dlr_edan_shared_control_converted_externally_to_rlds
9821012
title: dlr_edan_shared_control_converted_externally_to_rlds
9831013
- path: /datasets/catalog/dlr_sara_grid_clamp_converted_externally_to_rlds
9841014
title: dlr_sara_grid_clamp_converted_externally_to_rlds
9851015
- path: /datasets/catalog/dlr_sara_pour_converted_externally_to_rlds
9861016
title: dlr_sara_pour_converted_externally_to_rlds
1017+
- path: /datasets/catalog/dobbe
1018+
title: dobbe
9871019
- path: /datasets/catalog/eth_agent_affordances
9881020
title: eth_agent_affordances
1021+
- path: /datasets/catalog/fmb
1022+
title: fmb
9891023
- path: /datasets/catalog/fractal20220817_data
9901024
title: fractal20220817_data
9911025
- path: /datasets/catalog/iamlab_cmu_pickup_insert_converted_externally_to_rlds
9921026
title: iamlab_cmu_pickup_insert_converted_externally_to_rlds
9931027
- path: /datasets/catalog/imperialcollege_sawyer_wrist_cam
9941028
title: imperialcollege_sawyer_wrist_cam
1029+
- path: /datasets/catalog/io_ai_tech
1030+
title: io_ai_tech
9951031
- path: /datasets/catalog/jaco_play
9961032
title: jaco_play
9971033
- path: /datasets/catalog/kaist_nonprehensile_converted_externally_to_rlds
@@ -1000,6 +1036,8 @@ toc:
10001036
title: kuka
10011037
- path: /datasets/catalog/maniskill_dataset_converted_externally_to_rlds
10021038
title: maniskill_dataset_converted_externally_to_rlds
1039+
- path: /datasets/catalog/mimic_play
1040+
title: mimic_play
10031041
- path: /datasets/catalog/mt_opt
10041042
title: mt_opt
10051043
- path: /datasets/catalog/nyu_door_opening_surprising_effectiveness
@@ -1008,8 +1046,14 @@ toc:
10081046
title: nyu_franka_play_dataset_converted_externally_to_rlds
10091047
- path: /datasets/catalog/nyu_rot_dataset_converted_externally_to_rlds
10101048
title: nyu_rot_dataset_converted_externally_to_rlds
1049+
- path: /datasets/catalog/plex_robosuite
1050+
title: plex_robosuite
1051+
- path: /datasets/catalog/robo_set
1052+
title: robo_set
10111053
- path: /datasets/catalog/roboturk
10121054
title: roboturk
1055+
- path: /datasets/catalog/spoc_robot
1056+
title: spoc_robot
10131057
- path: /datasets/catalog/stanford_hydra_dataset_converted_externally_to_rlds
10141058
title: stanford_hydra_dataset_converted_externally_to_rlds
10151059
- path: /datasets/catalog/stanford_kuka_multimodal_dataset_converted_externally_to_rlds
@@ -1020,6 +1064,8 @@ toc:
10201064
title: stanford_robocook_converted_externally_to_rlds
10211065
- path: /datasets/catalog/taco_play
10221066
title: taco_play
1067+
- path: /datasets/catalog/tidybot
1068+
title: tidybot
10231069
- path: /datasets/catalog/tokyo_u_lsmo_converted_externally_to_rlds
10241070
title: tokyo_u_lsmo_converted_externally_to_rlds
10251071
- path: /datasets/catalog/toto
@@ -1044,6 +1090,8 @@ toc:
10441090
title: utokyo_xarm_bimanual_converted_externally_to_rlds
10451091
- path: /datasets/catalog/utokyo_xarm_pick_and_place_converted_externally_to_rlds
10461092
title: utokyo_xarm_pick_and_place_converted_externally_to_rlds
1093+
- path: /datasets/catalog/vima_converted_externally_to_rlds
1094+
title: vima_converted_externally_to_rlds
10471095
- path: /datasets/catalog/viola
10481096
title: viola
10491097
title: Robotics
@@ -1274,6 +1322,8 @@ toc:
12741322
title: databricks_dolly
12751323
- path: /datasets/catalog/definite_pronoun_resolution
12761324
title: definite_pronoun_resolution
1325+
- path: /datasets/catalog/dices
1326+
title: dices
12771327
- path: /datasets/catalog/doc_nli
12781328
title: doc_nli
12791329
- path: /datasets/catalog/dolphin_number_word
@@ -1520,6 +1570,8 @@ toc:
15201570
title: bool_q
15211571
- path: /datasets/catalog/bot_adversarial_dialogue
15221572
title: bot_adversarial_dialogue
1573+
- path: /datasets/catalog/dices
1574+
title: dices
15231575
- path: /datasets/catalog/imdb_reviews
15241576
title: imdb_reviews
15251577
- path: /datasets/catalog/natural_instructions
@@ -1536,6 +1588,8 @@ toc:
15361588
- section:
15371589
- path: /datasets/catalog/bot_adversarial_dialogue
15381590
title: bot_adversarial_dialogue
1591+
- path: /datasets/catalog/dices
1592+
title: dices
15391593
- path: /datasets/catalog/real_toxicity_prompts
15401594
title: real_toxicity_prompts
15411595
title: Text classification toxicity prediction
@@ -1673,7 +1727,6 @@ toc:
16731727
- path: /datasets/catalog/duke_ultrasound
16741728
title: duke_ultrasound
16751729
- path: /datasets/catalog/qm9
1676-
status: nightly
16771730
title: qm9
16781731
title: Uncategorized
16791732
- section:

0 commit comments

Comments
 (0)