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

Jump to bottom

Cuda safety in several headers #259

Merged
merged 1 commit into from
May 31, 2022
Merged

Cuda safety in several headers #259

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
4 changes: 2 additions & 2 deletions src/Imath/ImathColor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ template <class T> class IMATH_EXPORT_TEMPLATE_TYPE Color3 : public Vec3<T>
IMATH_HOSTDEVICE constexpr Color3 (const Vec3<S>& v) IMATH_NOEXCEPT;

/// Destructor
IMATH_HOSTDEVICE ~Color3 () = default;
~Color3() = default;

/// Component-wise assignment
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 const Color3&
Expand Down Expand Up @@ -156,7 +156,7 @@ template <class T> class IMATH_EXPORT_TEMPLATE_TYPE Color4
IMATH_NOEXCEPT;

/// Destructor
IMATH_HOSTDEVICE ~Color4 () = default;
~Color4() = default;

/// Assignment
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 const Color4&
Expand Down
2 changes: 1 addition & 1 deletion src/Imath/ImathEuler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ template <class T> class IMATH_EXPORT_TEMPLATE_TYPE Euler : public Vec3<T>
Euler (const Matrix44<T>&, Order o = Default) IMATH_NOEXCEPT;

/// Destructor
IMATH_HOSTDEVICE ~Euler () = default;
~Euler () = default;

/// @}

Expand Down
2 changes: 1 addition & 1 deletion src/Imath/ImathQuat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ template <class T> class IMATH_EXPORT_TEMPLATE_TYPE Quat
operator= (const Quat<T>& q) IMATH_NOEXCEPT;

/// Destructor
IMATH_HOSTDEVICE ~Quat () IMATH_NOEXCEPT = default;
~Quat () IMATH_NOEXCEPT = default;

/// @}

Expand Down
2 changes: 1 addition & 1 deletion src/Imath/ImathShear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ template <class T> class IMATH_EXPORT_TEMPLATE_TYPE Shear6
operator= (const Vec3<S>& v);

/// Destructor
IMATH_HOSTDEVICE ~Shear6 () = default;
~Shear6() = default;

/// @}

Expand Down
4 changes: 3 additions & 1 deletion src/Imath/half.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,9 @@
/// floats in question.
///

#ifdef _WIN32
#ifdef __CUDA_ARCH__
// do not include intrinsics headers on Cuda
#elif defined(_WIN32)
# include <intrin.h>
#elif defined(__x86_64__)
# include <x86intrin.h>
Expand Down