Merge branch 'main' into reloc

NVIDIA · Jul 19, 2024 · ad08331 · ad08331
2 parents f640849 + 2ff83a2
commit ad08331
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 76 deletions.
diff --git a/.github/workflows/build-rapids.yml b/.github/workflows/build-rapids.yml
@@ -3,14 +3,11 @@ name: Build all RAPIDS repositories
 on:
   workflow_call:
     inputs:
-      slack_token:
-        description: "The Slack token to use for notifications. No notifications will be sent if not provided."
+      enable_slack_alerts:
+        description: "If true, a message will be posted to the CCCL GHA CI Alert channel if the workflow fails."
         required: false
-        type: string
-      slack_alert:
-        description: "Slack channel ID for alert notifications."
-        required: false
-        type: string
+        default: false
+        type: boolean
 
 jobs:
   check-event:
@@ -25,6 +22,7 @@ jobs:
         run: |
           [[ '${{ github.event_name }}' == 'push' && '${{ github.repository }}' == 'NVIDIA/cccl' ]] || \
           [[ '${{ github.event_name }}' == 'schedule' && '${{ github.repository }}' == 'NVIDIA/cccl' ]] || \
+          [[ '${{ github.event_name }}' == 'workflow_dispatch' && '${{ github.repository }}' == 'NVIDIA/cccl' ]] || \
           [[ '${{ github.event_name }}' == 'pull_request' && '${{ github.repository }}' != 'NVIDIA/cccl' ]] \
           && echo "ok=true"  | tee -a $GITHUB_OUTPUT \
           || echo "ok=false" | tee -a $GITHUB_OUTPUT;
@@ -168,18 +166,18 @@ jobs:
 
   notify-failure:
     name: Notify Slack of RAPIDS failure
-    if: ${{ failure() && inputs.slack_token != '' && inputs.slack_alert != '' }}
+    if: ${{ failure() && inputs.enable_slack_alerts }}
     needs: build-rapids
     runs-on: ubuntu-latest
     steps:
       - name: Notify
         uses: slackapi/[email protected]
         env:
-          SLACK_BOT_TOKEN: ${{ inputs.slack_token }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_NOTIFIER_BOT_TOKEN }}
           WORKFLOW_TYPE: ${{ github.workflow }}
           SUMMARY_URL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
         with:
-          channel-id: ${{ inputs.slack_alert }}
+          channel-id: ${{ secrets.SLACK_CHANNEL_CI_ALERT }}
           slack-message: |
             RAPIDS build in workflow '${{ env.WORKFLOW_TYPE }}' failed.
 

diff --git a/.github/workflows/ci-workflow-nightly.yml b/.github/workflows/ci-workflow-nightly.yml
@@ -149,5 +149,4 @@ jobs:
       pull-requests: read
     uses: ./.github/workflows/build-rapids.yml
     with:
-      slack_token: ${{ secrets.SLACK_NOTIFIER_BOT_TOKEN }}
-      slack_alert: ${{ secrets.SLACK_CHANNEL_CI_ALERT }}
+      enable_slack_alerts: true
diff --git a/thrust/thrust/detail/complex/complex.inl b/thrust/thrust/detail/complex/complex.inl
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2021 NVIDIA Corporation
+ *  Copyright 2008-2024 NVIDIA Corporation
  *  Copyright 2013 Filipe RNC Maia
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,97 +26,44 @@ THRUST_NAMESPACE_BEGIN
 
 /* --- Constructors --- */
 
-#if THRUST_CPP_DIALECT < 2011
-template <typename T>
-_CCCL_HOST_DEVICE complex<T>::complex()
-{
-  real(T());
-  imag(T());
-}
-#endif
-
 template <typename T>
 _CCCL_HOST_DEVICE complex<T>::complex(const T& re)
-#if THRUST_CPP_DIALECT >= 2011
     // Initialize the storage in the member initializer list using C++ unicorn
     // initialization. This allows `complex<T const>` to work.
     : data{re, T()}
 {}
-#else
-{
-  real(re);
-  imag(T());
-}
-#endif
 
 template <typename T>
 _CCCL_HOST_DEVICE complex<T>::complex(const T& re, const T& im)
-#if THRUST_CPP_DIALECT >= 2011
     // Initialize the storage in the member initializer list using C++ unicorn
     // initialization. This allows `complex<T const>` to work.
     : data{re, im}
 {}
-#else
-{
-  real(re);
-  imag(im);
-}
-#endif
-
-#if THRUST_CPP_DIALECT < 2011
-template <typename T>
-_CCCL_HOST_DEVICE complex<T>::complex(const complex<T>& z)
-{
-  real(z.real());
-  imag(z.imag());
-}
-#endif
 
 template <typename T>
 template <typename U>
 _CCCL_HOST_DEVICE complex<T>::complex(const complex<U>& z)
-#if THRUST_CPP_DIALECT >= 2011
     // Initialize the storage in the member initializer list using C++ unicorn
     // initialization. This allows `complex<T const>` to work.
     // We do a functional-style cast here to suppress conversion warnings.
     : data{T(z.real()), T(z.imag())}
 {}
-#else
-{
-  real(T(z.real()));
-  imag(T(z.imag()));
-}
-#endif
 
 template <typename T>
 _CCCL_HOST THRUST_STD_COMPLEX_DEVICE complex<T>::complex(const std::complex<T>& z)
-#if THRUST_CPP_DIALECT >= 2011
     // Initialize the storage in the member initializer list using C++ unicorn
     // initialization. This allows `complex<T const>` to work.
     : data{THRUST_STD_COMPLEX_REAL(z), THRUST_STD_COMPLEX_IMAG(z)}
 {}
-#else
-{
-  real(THRUST_STD_COMPLEX_REAL(z));
-  imag(THRUST_STD_COMPLEX_IMAG(z));
-}
-#endif
 
 template <typename T>
 template <typename U>
 _CCCL_HOST THRUST_STD_COMPLEX_DEVICE complex<T>::complex(const std::complex<U>& z)
-#if THRUST_CPP_DIALECT >= 2011
     // Initialize the storage in the member initializer list using C++ unicorn
     // initialization. This allows `complex<T const>` to work.
     // We do a functional-style cast here to suppress conversion warnings.
     : data{T(THRUST_STD_COMPLEX_REAL(z)), T(THRUST_STD_COMPLEX_IMAG(z))}
 {}
-#else
-{
-  real(T(THRUST_STD_COMPLEX_REAL(z)));
-  imag(T(THRUST_STD_COMPLEX_IMAG(z)));
-}
-#endif
 
 /* --- Assignment Operators --- */
 
@@ -128,16 +75,6 @@ _CCCL_HOST_DEVICE complex<T>& complex<T>::operator=(const T& re)
   return *this;
 }
 
-#if THRUST_CPP_DIALECT < 2011
-template <typename T>
-_CCCL_HOST_DEVICE complex<T>& complex<T>::operator=(const complex<T>& z)
-{
-  real(z.real());
-  imag(z.imag());
-  return *this;
-}
-#endif
-
 template <typename T>
 template <typename U>
 _CCCL_HOST_DEVICE complex<T>& complex<T>::operator=(const complex<U>& z)