Skip to content

Commit

Permalink
Merge branch 'main' into gdpr
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverholworthy authored Apr 25, 2024
2 parents a03eabe + 426e034 commit f608860
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ self-hosted-runner:
labels:
- 1GPU
- 2GPU
- linux-amd64-gpu-p100-latest-1
2 changes: 1 addition & 1 deletion merlin/io/writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def _add_data_slice(self, df):
# the df and write out slices.
if self.shuffle:
df = shuffle_df(df)
int_slice_size = df.shape[0] // self.num_out_files
int_slice_size = max(df.shape[0] // self.num_out_files, 1)
slice_size = int_slice_size if df.shape[0] % int_slice_size == 0 else int_slice_size + 1
for x in range(self.num_out_files):
start = x * slice_size
Expand Down
16 changes: 8 additions & 8 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
sphinx-multiversion@git+https://github.com/mikemckiernan/sphinx-multiversion.git
sphinxcontrib-copydirs@git+https://github.com/mikemckiernan/sphinxcontrib-copydirs.git
recommonmark==0.7.1
recommonmark~=0.7.1
Jinja2<3.1
natsort==8.0.1
myst-nb==0.17.2
linkify-it-py==1.0.3
sphinx-external-toc==0.2.4
attrs==21.4.0
sphinx-book-theme==1.0.1
sphinx_design
natsort~=8.4.0
myst-nb~=1.1.0
linkify-it-py~=2.0.3
sphinx-external-toc~=1.0.1
attrs~=23.2.0
sphinx-book-theme~=1.1.2
sphinx_design~=0.5.0

0 comments on commit f608860

Please sign in to comment.