Build for CPU only if CUDA is not available #28
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ghstack-poisoned]
nairbv
reviewed
Jun 11, 2020
| m.def("supports_cuda", &supports_cuda); | ||
| m.def("create_random_device_generator", &create_random_device_generator, py::arg("token") = nullptr); | ||
| m.def("create_mt19937_generator", &create_mt19937_generator, py::arg("seed") = nullptr); | ||
| } |
There was a problem hiding this comment.
Can any of the shared code that isn't cuda-specific go in the cpp file instead of .h?
I notice in pytorch the PYBIND11_MODULE calls at least are all in .cpp files.
nairbv
reviewed
Jun 11, 2020
| @@ -29,7 +29,7 @@ class TestCSPRNG(unittest.TestCase): | |||
|
|
|||
| size = 1000 | |||
|
|
|||
| all_devices = ['cpu', 'cuda'] | |||
| all_devices = ['cpu', 'cuda'] if csprng.supports_cuda() else ['cpu'] | |||
There was a problem hiding this comment.
is there something we'd need to do (in the .circleci config?) to get this to run on a non-cuda machine, so we can validate that changes don't break the cpu-only build?
facebook-github-bot
pushed a commit
to pytorch/pytorch
that referenced
this pull request
Jun 12, 2020
….cuh (#39797) Summary: Pull Request resolved: #39797 This change allows using [OffsetCalculator.cuh](https://github.com/pytorch/pytorch/blob/master/aten/src/ATen/cuda/detail/OffsetCalculator.cuh) on both CPU and CUDA. It is required by (and manually tested with) pytorch/csprng#28 Test Plan: Imported from OSS Differential Revision: D22002571 Pulled By: pbelevich fbshipit-source-id: 0b85e465777f6613f3b3ba91873da57dab949c54
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 12, 2020
…cache methods in normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 12, 2020
… normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 12, 2020
…cache methods in normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 12, 2020
… normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 13, 2020
…cache methods in normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 13, 2020
… normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 13, 2020
…cache methods in normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 13, 2020
… normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 15, 2020
…cache methods in normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 15, 2020
… normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 15, 2020
…cache methods in normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
pbelevich
added a commit
to pytorch/pytorch
that referenced
this pull request
Jun 15, 2020
… normal_distribution" This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Differential Revision: [D22002599](https://our.internmc.facebook.com/intern/diff/D22002599) [ghstack-poisoned]
facebook-github-bot
pushed a commit
to pytorch/pytorch
that referenced
this pull request
Jun 16, 2020
…tribution (#39816) Summary: Pull Request resolved: #39816 This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes #39618 Test Plan: Imported from OSS Differential Revision: D22002599 Pulled By: pbelevich fbshipit-source-id: e33d42a7e88c5729b077b9cdbf1437158dab48bc
If setup.py detects CUDA_HOME then build using nvcc, otherwise using cc Fixes #21 Depends on: pytorch/pytorch#39797 pytorch/pytorch#39816 [ghstack-poisoned]
If setup.py detects CUDA_HOME then build using nvcc, otherwise using cc Fixes #21 Depends on: pytorch/pytorch#39797 pytorch/pytorch#39816 [ghstack-poisoned]
If setup.py detects CUDA_HOME then build using nvcc, otherwise using cc Fixes #21 Depends on: pytorch/pytorch#39797 pytorch/pytorch#39816 [ghstack-poisoned]
If setup.py detects CUDA_HOME then build using nvcc, otherwise using cc Fixes #21 Depends on: pytorch/pytorch#39797 pytorch/pytorch#39816 [ghstack-poisoned]
xwang233
pushed a commit
to xwang233/pytorch
that referenced
this pull request
Jun 20, 2020
….cuh (pytorch#39797) Summary: Pull Request resolved: pytorch#39797 This change allows using [OffsetCalculator.cuh](https://github.com/pytorch/pytorch/blob/master/aten/src/ATen/cuda/detail/OffsetCalculator.cuh) on both CPU and CUDA. It is required by (and manually tested with) pytorch/csprng#28 Test Plan: Imported from OSS Differential Revision: D22002571 Pulled By: pbelevich fbshipit-source-id: 0b85e465777f6613f3b3ba91873da57dab949c54
xwang233
pushed a commit
to xwang233/pytorch
that referenced
this pull request
Jun 20, 2020
…tribution (pytorch#39816) Summary: Pull Request resolved: pytorch#39816 This change replaces [`#if !defined(__CUDACC__) && !defined(__HIPCC__)`](https://github.com/pytorch/pytorch/blob/856215509d89c935cd1768ce4b496d4fc0e919a6/aten/src/ATen/core/DistributionsHelper.h#L147) with SFINAE expression that checks if RNG typename has next_double_normal_sample, set_next_double_normal_sample, next_float_normal_sample, set_next_float_normal_sample methods It is required by (and manually tested with) pytorch/csprng#28 Fixes pytorch#39618 Test Plan: Imported from OSS Differential Revision: D22002599 Pulled By: pbelevich fbshipit-source-id: e33d42a7e88c5729b077b9cdbf1437158dab48bc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If setup.py detects CUDA_HOME then build using nvcc, otherwise using cc
Fixes #21
Depends on:
pytorch/pytorch#39797
pytorch/pytorch#39816
Stack from ghstack: