Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Set device for torch tensors with gpu > 1 (#132)" #134

Merged
merged 1 commit into from
Apr 14, 2023
Merged

Revert "Set device for torch tensors with gpu > 1 (#132)" #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions merlin/dataloader/loader_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,7 @@ def _to_tensor(self, df_or_series):
if self.device == "cpu":
tensor = df_or_series.to_numpy()
else:
with cupy.cuda.Device(self.device):
tensor = df_or_series.to_cupy()
tensor = df_or_series.to_cupy()

return tensor

Expand Down
6 changes: 0 additions & 6 deletions merlin/dataloader/torch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
import contextlib
from functools import partial

from merlin.core.compat.torch import torch as th
Expand Down Expand Up @@ -119,11 +118,6 @@ def map(self, fn):

return self

def _get_device_ctx(self, dev):
if dev == "cpu" or not th:
return contextlib.nullcontext()
return th.cuda.device(f"cuda:{dev}")


class DLDataLoader(th.utils.data.DataLoader):
"""
Expand Down