Skip to content

Commit d1111cc

Browse files
authored
Merge branch 'main' into ci/skip_gpu_when_pr_closed
2 parents 3e755f3 + 879f5b6 commit d1111cc

Some content is hidden

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

46 files changed

+44
-5305
lines changed

.github/workflows/pytorch.yml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
name: pytorch
2+
# name: pytorch
33

4-
on:
5-
push:
6-
branches: [main]
7-
pull_request:
8-
branches: [main]
4+
# on:
5+
# push:
6+
# branches: [main]
7+
# pull_request:
8+
# branches: [main]
99

1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}
@@ -19,37 +19,37 @@ jobs:
1919
python-version: [3.8]
2020
os: [ubuntu-latest]
2121

22-
steps:
23-
- uses: actions/checkout@v3
24-
- name: Set up Python ${{ matrix.python-version }}
25-
uses: actions/setup-python@v4
26-
with:
27-
python-version: ${{ matrix.python-version }}
28-
cache: 'pip'
29-
cache-dependency-path: 'requirements/dev.txt'
30-
- name: Install Ubuntu packages
31-
run: |
32-
sudo apt-get update -y
33-
sudo apt-get install -y protobuf-compiler
34-
- name: Install Merlin dependencies
35-
run: |
36-
ref_type=${{ github.ref_type }}
37-
branch=main
38-
if [[ $ref_type == "tag"* ]]
39-
then
40-
git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/release*:refs/remotes/origin/release*
41-
branch=$(git branch -r --contains ${{ github.ref_name }} --list '*release*' --format "%(refname:short)" | sed -e 's/^origin\///')
42-
fi
43-
pip install "pandas>=1.2.0,<1.4.0dev0"
44-
pip install "NVTabular@git+https://github.com/NVIDIA-Merlin/NVTabular.git@$branch"
45-
pip install "merlin-core@git+https://github.com/NVIDIA-Merlin/core.git@$branch"
46-
- name: Install dependencies
47-
run: |
48-
python -m pip install --upgrade pip
49-
python -m pip install .[pytorch-dev]
50-
- name: Build
51-
run: |
52-
python setup.py develop
53-
- name: Run unittests
54-
run: |
55-
make tests-torch
22+
# steps:
23+
# - uses: actions/checkout@v3
24+
# - name: Set up Python ${{ matrix.python-version }}
25+
# uses: actions/setup-python@v4
26+
# with:
27+
# python-version: ${{ matrix.python-version }}
28+
# cache: 'pip'
29+
# cache-dependency-path: 'requirements/dev.txt'
30+
# - name: Install Ubuntu packages
31+
# run: |
32+
# sudo apt-get update -y
33+
# sudo apt-get install -y protobuf-compiler
34+
# - name: Install Merlin dependencies
35+
# run: |
36+
# ref_type=${{ github.ref_type }}
37+
# branch=main
38+
# if [[ $ref_type == "tag"* ]]
39+
# then
40+
# git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/release*:refs/remotes/origin/release*
41+
# branch=$(git branch -r --contains ${{ github.ref_name }} --list '*release*' --format "%(refname:short)" | sed -e 's/^origin\///')
42+
# fi
43+
# pip install "pandas>=1.2.0,<1.4.0dev0"
44+
# pip install "NVTabular@git+https://github.com/NVIDIA-Merlin/NVTabular.git@$branch"
45+
# pip install "merlin-core@git+https://github.com/NVIDIA-Merlin/core.git@$branch"
46+
# - name: Install dependencies
47+
# run: |
48+
# python -m pip install --upgrade pip
49+
# python -m pip install .[pytorch-dev]
50+
# - name: Build
51+
# run: |
52+
# python setup.py develop
53+
# - name: Run unittests
54+
# run: |
55+
# make tests-torch

examples/usecases/multi-gpu/install_sparse_operation_kit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cd $ROOT_DIR
88

99
rm -rf hugectr/
1010

11-
git clone -b release-23.02 https://github.com/NVIDIA-Merlin/HugeCTR.git hugectr
11+
git clone https://github.com/NVIDIA-Merlin/HugeCTR.git hugectr
1212

1313
cd hugectr/sparse_operation_kit/
1414
python setup.py install

merlin/models/tf/distributed/backend.py

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

3131

3232
if sok_installed:
33-
sok.init()
33+
sok.init(use_legacy_optimizer=False)

merlin/models/torch/__init__.py

Lines changed: 0 additions & 97 deletions
This file was deleted.

merlin/models/torch/block/__init__.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)