From 06cc547bd07dbab4229327fd5c1d8bca828c98ed Mon Sep 17 00:00:00 2001
From: jonch <9093549+jon-chuang@users.noreply.github.com>
Date: Sun, 8 Nov 2020 11:28:33 +0800
Subject: [PATCH] fix remaining errors

---
 .github/workflows/ci.yml                               | 10 +++-------
 .../src/curves/cuda/scalar_mul/cpu_gpu_macros.rs       |  4 ++--
 .../src/curves/cuda/scalar_mul/kernel_macros.rs        |  1 -
 algebra-core/src/curves/cuda/scalar_mul/mod.rs         |  6 ++----
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cfe9f9d84..e379403b7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,12 +50,9 @@ jobs:
           toolchain: ${{ matrix.rust }}
           override: true
 
-      - name: Install Rust nightly for CUDA
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2020-09-20
-          components: rustfmt
+      - name: Install CUDA toolchains
+        run: |
+          curl -sSL https://github.com/jon-chuang/accel/raw/master/setup_nvptx_toolchain.sh | bash
 
       - uses: actions/cache@v2
         with:
@@ -104,7 +101,6 @@ jobs:
       - name: Test algebra with CUDA
         run: |
           cd algebra
-          curl -sSL https://github.com/jon-chuang/accel/raw/master/setup_nvptx_toolchain.sh | bash
           cargo test --features "all_curves cuda cuda_test"
 
       - name: Test algebra with assembly
diff --git a/algebra-core/src/curves/cuda/scalar_mul/cpu_gpu_macros.rs b/algebra-core/src/curves/cuda/scalar_mul/cpu_gpu_macros.rs
index e49698c4e..6a4000683 100644
--- a/algebra-core/src/curves/cuda/scalar_mul/cpu_gpu_macros.rs
+++ b/algebra-core/src/curves/cuda/scalar_mul/cpu_gpu_macros.rs
@@ -12,7 +12,7 @@ macro_rules! impl_gpu_cpu_run_kernel {
                     .join("cuda-scalar-mul-profiler")
                     .join(P::namespace());
                 std::fs::create_dir_all(&dir)?;
-                Ok(dir.to_str().to_string())
+                Ok(dir.to_str().unwrap().to_string())
             }
             #[cfg(not(feature = "cuda"))]
             Err(crate::CudaScalarMulError::CudaDisabledError)
@@ -22,7 +22,7 @@ macro_rules! impl_gpu_cpu_run_kernel {
         fn read_profile_data() -> Result<crate::String, crate::CudaScalarMulError> {
             #[cfg(feature = "cuda")]
             {
-                let dir = Self::init_gpu_cache_dir()?;
+                let dir = std::path::PathBuf::from(Self::init_gpu_cache_dir()?);
                 let data = std::fs::read_to_string(&dir.join("profile_data.txt"))?;
                 Ok(data)
             }
diff --git a/algebra-core/src/curves/cuda/scalar_mul/kernel_macros.rs b/algebra-core/src/curves/cuda/scalar_mul/kernel_macros.rs
index 04a4bc42b..cb04b94f0 100644
--- a/algebra-core/src/curves/cuda/scalar_mul/kernel_macros.rs
+++ b/algebra-core/src/curves/cuda/scalar_mul/kernel_macros.rs
@@ -35,7 +35,6 @@ macro_rules! impl_scalar_mul_kernel {
                     <<<$ProjCurve as ProjectiveCurve>::ScalarField as PrimeField>::Params as FpParameters>::MODULUS_BITS as isize;
                 const LOG2_W: isize = 5;
                 const TABLE_SIZE: isize = 1 << LOG2_W;
-                const HALF_TABLE_SIZE: isize = 1 << (LOG2_W - 1);
                 const NUM_U8: isize = (NUM_BITS - 1) / LOG2_W + 1;
 
                 #[kernel_func]
diff --git a/algebra-core/src/curves/cuda/scalar_mul/mod.rs b/algebra-core/src/curves/cuda/scalar_mul/mod.rs
index 30d665b6d..b9dd52de9 100644
--- a/algebra-core/src/curves/cuda/scalar_mul/mod.rs
+++ b/algebra-core/src/curves/cuda/scalar_mul/mod.rs
@@ -57,7 +57,7 @@ impl fmt::Display for CudaScalarMulError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         match self {
             CudaScalarMulError::CudaDisabledError => write!(f, "CUDA is disabled"),
-            CudaScalarMulError::IoError=> write!(f, "IO error"),
+            CudaScalarMulError::IoError => write!(f, "IO error"),
             CudaScalarMulError::KernelFailedError => write!(f, "Failed running kernel"),
             CudaScalarMulError::ProfilingSerializationError => {
                 write!(f, "Failed serlializing profiling data")
@@ -127,9 +127,7 @@ pub(crate) mod internal {
     use crate::accel_dummy::*;
 
     #[cfg(not(feature = "std"))]
-    use alloc::vec::Vec;
-    #[cfg(not(feature = "std"))]
-    use alloc::string::String;
+    use alloc::{string::String, vec::Vec};
 
     use crate::{curves::AffineCurve, fields::PrimeField, CudaScalarMulError};