chore(gpu): fix gpu package for publication

zama-ai · Jan 22, 2024 · 548f2e5 · 548f2e5
1 parent f313b58
commit 548f2e5
Show file tree

Hide file tree

Showing 80 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -144,7 +144,7 @@ fmt: install_rs_check_toolchain
 .PHONY: fmt_gpu # Format rust and cuda code
 fmt_gpu: install_rs_check_toolchain
 	cargo "$(CARGO_RS_CHECK_TOOLCHAIN)" fmt
-	cd backends/tfhe-cuda-backend/implementation/ && ./format_tfhe_cuda_backend.sh
+	cd "$(TFHECUDA_SRC)" && ./format_tfhe_cuda_backend.sh
 
 .PHONY: check_fmt # Check rust code format
 check_fmt: install_rs_check_toolchain

diff --git a/...nds/tfhe-cuda-backend/rust_api/Cargo.toml → backends/tfhe-cuda-backend/Cargo.toml b/...nds/tfhe-cuda-backend/rust_api/Cargo.toml → backends/tfhe-cuda-backend/Cargo.toml
diff --git a/backends/tfhe-cuda-backend/rust_api/LICENSE → backends/tfhe-cuda-backend/LICENSE b/backends/tfhe-cuda-backend/rust_api/LICENSE → backends/tfhe-cuda-backend/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause Clear License
 
-Copyright © 2023 ZAMA.
+Copyright © 2024 ZAMA.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/...fhe-cuda-backend/implementation/README.md → backends/tfhe-cuda-backend/README.md b/...fhe-cuda-backend/implementation/README.md → backends/tfhe-cuda-backend/README.md
diff --git a/backends/tfhe-cuda-backend/rust_api/build.rs → backends/tfhe-cuda-backend/build.rs b/backends/tfhe-cuda-backend/rust_api/build.rs → backends/tfhe-cuda-backend/build.rs
@@ -12,7 +12,7 @@ fn main() {
                 Only Ubuntu is supported by tfhe-cuda-backend at this time. Build may fail\n"
             );
         }
-        let dest = cmake::build("../implementation");
+        let dest = cmake::build("cuda");
         println!("cargo:rustc-link-search=native={}", dest.display());
         println!("cargo:rustc-link-lib=static=tfhe_cuda_backend");
         println!("cargo:rustc-link-search=native=/usr/local/cuda/lib64");

diff --git a/...nd/implementation/.cmake-format-config.py → ...cuda-backend/cuda/.cmake-format-config.py b/...nd/implementation/.cmake-format-config.py → ...cuda-backend/cuda/.cmake-format-config.py
diff --git a/...uda-backend/implementation/CMakeLists.txt → ...nds/tfhe-cuda-backend/cuda/CMakeLists.txt b/...uda-backend/implementation/CMakeLists.txt → ...nds/tfhe-cuda-backend/cuda/CMakeLists.txt
diff --git a/...e-cuda-backend/implementation/CPPLINT.cfg → backends/tfhe-cuda-backend/cuda/CPPLINT.cfg b/...e-cuda-backend/implementation/CPPLINT.cfg → backends/tfhe-cuda-backend/cuda/CPPLINT.cfg
diff --git a/...cuda-backend/implementation/check_cuda.cu → ...ends/tfhe-cuda-backend/cuda/check_cuda.cu b/...cuda-backend/implementation/check_cuda.cu → ...ends/tfhe-cuda-backend/cuda/check_cuda.cu
diff --git a/...mplementation/format_tfhe_cuda_backend.sh → ...-backend/cuda/format_tfhe_cuda_backend.sh b/...mplementation/format_tfhe_cuda_backend.sh → ...-backend/cuda/format_tfhe_cuda_backend.sh
diff --git a/...ackend/implementation/include/bootstrap.h → ...fhe-cuda-backend/cuda/include/bootstrap.h b/...ackend/implementation/include/bootstrap.h → ...fhe-cuda-backend/cuda/include/bootstrap.h
diff --git a/...plementation/include/bootstrap_multibit.h → ...backend/cuda/include/bootstrap_multibit.h b/...plementation/include/bootstrap_multibit.h → ...backend/cuda/include/bootstrap_multibit.h
diff --git a/...ckend/implementation/include/ciphertext.h → ...he-cuda-backend/cuda/include/ciphertext.h b/...ckend/implementation/include/ciphertext.h → ...he-cuda-backend/cuda/include/ciphertext.h
diff --git a/...a-backend/implementation/include/device.h → ...s/tfhe-cuda-backend/cuda/include/device.h b/...a-backend/implementation/include/device.h → ...s/tfhe-cuda-backend/cuda/include/device.h
diff --git a/...d/implementation/include/helper_debug.cuh → ...uda-backend/cuda/include/helper_debug.cuh b/...d/implementation/include/helper_debug.cuh → ...uda-backend/cuda/include/helper_debug.cuh
diff --git a/...-backend/implementation/include/integer.h → .../tfhe-cuda-backend/cuda/include/integer.h b/...-backend/implementation/include/integer.h → .../tfhe-cuda-backend/cuda/include/integer.h
diff --git a/...ackend/implementation/include/keyswitch.h → ...fhe-cuda-backend/cuda/include/keyswitch.h b/...ackend/implementation/include/keyswitch.h → ...fhe-cuda-backend/cuda/include/keyswitch.h
diff --git a/...d/implementation/include/linear_algebra.h → ...uda-backend/cuda/include/linear_algebra.h b/...d/implementation/include/linear_algebra.h → ...uda-backend/cuda/include/linear_algebra.h
diff --git a/...backend/implementation/src/CMakeLists.txt → ...tfhe-cuda-backend/cuda/src/CMakeLists.txt b/...backend/implementation/src/CMakeLists.txt → ...tfhe-cuda-backend/cuda/src/CMakeLists.txt
diff --git a/...d/implementation/src/crypto/ciphertext.cu → ...uda-backend/cuda/src/crypto/ciphertext.cu b/...d/implementation/src/crypto/ciphertext.cu → ...uda-backend/cuda/src/crypto/ciphertext.cu
diff --git a/.../implementation/src/crypto/ciphertext.cuh → ...da-backend/cuda/src/crypto/ciphertext.cuh b/.../implementation/src/crypto/ciphertext.cuh → ...da-backend/cuda/src/crypto/ciphertext.cuh
diff --git a/...kend/implementation/src/crypto/gadget.cuh → ...e-cuda-backend/cuda/src/crypto/gadget.cuh b/...kend/implementation/src/crypto/gadget.cuh → ...e-cuda-backend/cuda/src/crypto/gadget.cuh
diff --git a/...ackend/implementation/src/crypto/ggsw.cuh → ...fhe-cuda-backend/cuda/src/crypto/ggsw.cuh b/...ackend/implementation/src/crypto/ggsw.cuh → ...fhe-cuda-backend/cuda/src/crypto/ggsw.cuh
diff --git a/...nd/implementation/src/crypto/keyswitch.cu → ...cuda-backend/cuda/src/crypto/keyswitch.cu b/...nd/implementation/src/crypto/keyswitch.cu → ...cuda-backend/cuda/src/crypto/keyswitch.cu
diff --git a/...d/implementation/src/crypto/keyswitch.cuh → ...uda-backend/cuda/src/crypto/keyswitch.cuh b/...d/implementation/src/crypto/keyswitch.cuh → ...uda-backend/cuda/src/crypto/keyswitch.cuh
diff --git a/...ckend/implementation/src/crypto/torus.cuh → ...he-cuda-backend/cuda/src/crypto/torus.cuh b/...ckend/implementation/src/crypto/torus.cuh → ...he-cuda-backend/cuda/src/crypto/torus.cuh
diff --git a/...cuda-backend/implementation/src/device.cu → ...ends/tfhe-cuda-backend/cuda/src/device.cu b/...cuda-backend/implementation/src/device.cu → ...ends/tfhe-cuda-backend/cuda/src/device.cu
diff --git a/...ackend/implementation/src/fft/bnsmfft.cuh → ...fhe-cuda-backend/cuda/src/fft/bnsmfft.cuh b/...ackend/implementation/src/fft/bnsmfft.cuh → ...fhe-cuda-backend/cuda/src/fft/bnsmfft.cuh
diff --git a/...ackend/implementation/src/fft/twiddles.cu → ...fhe-cuda-backend/cuda/src/fft/twiddles.cu b/...ackend/implementation/src/fft/twiddles.cu → ...fhe-cuda-backend/cuda/src/fft/twiddles.cu
diff --git a/...ckend/implementation/src/fft/twiddles.cuh → ...he-cuda-backend/cuda/src/fft/twiddles.cuh b/...ckend/implementation/src/fft/twiddles.cuh → ...he-cuda-backend/cuda/src/fft/twiddles.cuh
diff --git a/...implementation/src/integer/bitwise_ops.cu → ...a-backend/cuda/src/integer/bitwise_ops.cu b/...implementation/src/integer/bitwise_ops.cu → ...a-backend/cuda/src/integer/bitwise_ops.cu
diff --git a/...mplementation/src/integer/bitwise_ops.cuh → ...-backend/cuda/src/integer/bitwise_ops.cuh b/...mplementation/src/integer/bitwise_ops.cuh → ...-backend/cuda/src/integer/bitwise_ops.cuh
diff --git a/...ackend/implementation/src/integer/cmux.cu → ...fhe-cuda-backend/cuda/src/integer/cmux.cu b/...ackend/implementation/src/integer/cmux.cu → ...fhe-cuda-backend/cuda/src/integer/cmux.cu
diff --git a/...ckend/implementation/src/integer/cmux.cuh → ...he-cuda-backend/cuda/src/integer/cmux.cuh b/...ckend/implementation/src/integer/cmux.cuh → ...he-cuda-backend/cuda/src/integer/cmux.cuh
diff --git a/.../implementation/src/integer/comparison.cu → ...da-backend/cuda/src/integer/comparison.cu b/.../implementation/src/integer/comparison.cu → ...da-backend/cuda/src/integer/comparison.cu
diff --git a/...implementation/src/integer/comparison.cuh → ...a-backend/cuda/src/integer/comparison.cuh b/...implementation/src/integer/comparison.cuh → ...a-backend/cuda/src/integer/comparison.cuh
diff --git a/...end/implementation/src/integer/integer.cu → ...-cuda-backend/cuda/src/integer/integer.cu b/...end/implementation/src/integer/integer.cu → ...-cuda-backend/cuda/src/integer/integer.cu
diff --git a/...nd/implementation/src/integer/integer.cuh → ...cuda-backend/cuda/src/integer/integer.cuh b/...nd/implementation/src/integer/integer.cuh → ...cuda-backend/cuda/src/integer/integer.cuh
diff --git a/...lementation/src/integer/multiplication.cu → ...ackend/cuda/src/integer/multiplication.cu b/...lementation/src/integer/multiplication.cu → ...ackend/cuda/src/integer/multiplication.cu
diff --git a/...ementation/src/integer/multiplication.cuh → ...ckend/cuda/src/integer/multiplication.cuh b/...ementation/src/integer/multiplication.cuh → ...ckend/cuda/src/integer/multiplication.cuh
diff --git a/...nd/implementation/src/integer/negation.cu → ...cuda-backend/cuda/src/integer/negation.cu b/...nd/implementation/src/integer/negation.cu → ...cuda-backend/cuda/src/integer/negation.cu
diff --git a/...d/implementation/src/integer/negation.cuh → ...uda-backend/cuda/src/integer/negation.cuh b/...d/implementation/src/integer/negation.cuh → ...uda-backend/cuda/src/integer/negation.cuh
diff --git a/...ementation/src/integer/scalar_addition.cu → ...ckend/cuda/src/integer/scalar_addition.cu b/...ementation/src/integer/scalar_addition.cu → ...ckend/cuda/src/integer/scalar_addition.cu
diff --git a/...mentation/src/integer/scalar_addition.cuh → ...kend/cuda/src/integer/scalar_addition.cuh b/...mentation/src/integer/scalar_addition.cuh → ...kend/cuda/src/integer/scalar_addition.cuh
diff --git a/...plementation/src/integer/scalar_bitops.cu → ...backend/cuda/src/integer/scalar_bitops.cu b/...plementation/src/integer/scalar_bitops.cu → ...backend/cuda/src/integer/scalar_bitops.cu
diff --git a/...lementation/src/integer/scalar_bitops.cuh → ...ackend/cuda/src/integer/scalar_bitops.cuh b/...lementation/src/integer/scalar_bitops.cuh → ...ackend/cuda/src/integer/scalar_bitops.cuh
diff --git a/...entation/src/integer/scalar_comparison.cu → ...end/cuda/src/integer/scalar_comparison.cu b/...entation/src/integer/scalar_comparison.cu → ...end/cuda/src/integer/scalar_comparison.cu
diff --git a/...ntation/src/integer/scalar_comparison.cuh → ...nd/cuda/src/integer/scalar_comparison.cuh b/...ntation/src/integer/scalar_comparison.cuh → ...nd/cuda/src/integer/scalar_comparison.cuh
diff --git a/...plementation/src/integer/scalar_rotate.cu → ...backend/cuda/src/integer/scalar_rotate.cu b/...plementation/src/integer/scalar_rotate.cu → ...backend/cuda/src/integer/scalar_rotate.cu
diff --git a/...lementation/src/integer/scalar_rotate.cuh → ...ackend/cuda/src/integer/scalar_rotate.cuh b/...lementation/src/integer/scalar_rotate.cuh → ...ackend/cuda/src/integer/scalar_rotate.cuh
diff --git a/...plementation/src/integer/scalar_shifts.cu → ...backend/cuda/src/integer/scalar_shifts.cu b/...plementation/src/integer/scalar_shifts.cu → ...backend/cuda/src/integer/scalar_shifts.cu
diff --git a/...lementation/src/integer/scalar_shifts.cuh → ...ackend/cuda/src/integer/scalar_shifts.cuh b/...lementation/src/integer/scalar_shifts.cuh → ...ackend/cuda/src/integer/scalar_shifts.cuh
diff --git a/...end/implementation/src/integer/shifts.cuh → ...-cuda-backend/cuda/src/integer/shifts.cuh b/...end/implementation/src/integer/shifts.cuh → ...-cuda-backend/cuda/src/integer/shifts.cuh
diff --git a/...lementation/src/linearalgebra/addition.cu → ...ackend/cuda/src/linearalgebra/addition.cu b/...lementation/src/linearalgebra/addition.cu → ...ackend/cuda/src/linearalgebra/addition.cu
diff --git a/...ementation/src/linearalgebra/addition.cuh → ...ckend/cuda/src/linearalgebra/addition.cuh b/...ementation/src/linearalgebra/addition.cuh → ...ckend/cuda/src/linearalgebra/addition.cuh
diff --git a/...ation/src/linearalgebra/multiplication.cu → .../cuda/src/linearalgebra/multiplication.cu b/...ation/src/linearalgebra/multiplication.cu → .../cuda/src/linearalgebra/multiplication.cu
diff --git a/...tion/src/linearalgebra/multiplication.cuh → ...cuda/src/linearalgebra/multiplication.cuh b/...tion/src/linearalgebra/multiplication.cuh → ...cuda/src/linearalgebra/multiplication.cuh
diff --git a/...lementation/src/linearalgebra/negation.cu → ...ackend/cuda/src/linearalgebra/negation.cu b/...lementation/src/linearalgebra/negation.cu → ...ackend/cuda/src/linearalgebra/negation.cu
diff --git a/...ementation/src/linearalgebra/negation.cuh → ...ckend/cuda/src/linearalgebra/negation.cuh b/...ementation/src/linearalgebra/negation.cuh → ...ckend/cuda/src/linearalgebra/negation.cuh
diff --git a/...ckend/implementation/src/pbs/bootstrap.cu → ...he-cuda-backend/cuda/src/pbs/bootstrap.cu b/...ckend/implementation/src/pbs/bootstrap.cu → ...he-cuda-backend/cuda/src/pbs/bootstrap.cu
diff --git a/...ementation/src/pbs/bootstrap_amortized.cu → ...ckend/cuda/src/pbs/bootstrap_amortized.cu b/...ementation/src/pbs/bootstrap_amortized.cu → ...ckend/cuda/src/pbs/bootstrap_amortized.cu
diff --git a/...mentation/src/pbs/bootstrap_amortized.cuh → ...kend/cuda/src/pbs/bootstrap_amortized.cuh b/...mentation/src/pbs/bootstrap_amortized.cuh → ...kend/cuda/src/pbs/bootstrap_amortized.cuh
diff --git a/...on/src/pbs/bootstrap_fast_low_latency.cuh → ...da/src/pbs/bootstrap_fast_low_latency.cuh b/...on/src/pbs/bootstrap_fast_low_latency.cuh → ...da/src/pbs/bootstrap_fast_low_latency.cuh
diff --git a/...ation/src/pbs/bootstrap_fast_multibit.cuh → .../cuda/src/pbs/bootstrap_fast_multibit.cuh b/...ation/src/pbs/bootstrap_fast_multibit.cuh → .../cuda/src/pbs/bootstrap_fast_multibit.cuh
diff --git a/...entation/src/pbs/bootstrap_low_latency.cu → ...end/cuda/src/pbs/bootstrap_low_latency.cu b/...entation/src/pbs/bootstrap_low_latency.cu → ...end/cuda/src/pbs/bootstrap_low_latency.cu
diff --git a/...ntation/src/pbs/bootstrap_low_latency.cuh → ...nd/cuda/src/pbs/bootstrap_low_latency.cuh b/...ntation/src/pbs/bootstrap_low_latency.cuh → ...nd/cuda/src/pbs/bootstrap_low_latency.cuh
diff --git a/...lementation/src/pbs/bootstrap_multibit.cu → ...ackend/cuda/src/pbs/bootstrap_multibit.cu b/...lementation/src/pbs/bootstrap_multibit.cu → ...ackend/cuda/src/pbs/bootstrap_multibit.cu
diff --git a/...ementation/src/pbs/bootstrap_multibit.cuh → ...ckend/cuda/src/pbs/bootstrap_multibit.cuh b/...ementation/src/pbs/bootstrap_multibit.cuh → ...ckend/cuda/src/pbs/bootstrap_multibit.cuh
diff --git a/...lementation/src/pbs/bootstrapping_key.cuh → ...ackend/cuda/src/pbs/bootstrapping_key.cuh b/...lementation/src/pbs/bootstrapping_key.cuh → ...ackend/cuda/src/pbs/bootstrapping_key.cuh
diff --git a/...plementation/src/polynomial/functions.cuh → ...backend/cuda/src/polynomial/functions.cuh b/...plementation/src/polynomial/functions.cuh → ...backend/cuda/src/polynomial/functions.cuh
diff --git a/...lementation/src/polynomial/parameters.cuh → ...ackend/cuda/src/polynomial/parameters.cuh b/...lementation/src/polynomial/parameters.cuh → ...ackend/cuda/src/polynomial/parameters.cuh
diff --git a/...tation/src/polynomial/polynomial_math.cuh → ...d/cuda/src/polynomial/polynomial_math.cuh b/...tation/src/polynomial/polynomial_math.cuh → ...d/cuda/src/polynomial/polynomial_math.cuh
diff --git a/...entation/src/types/complex/operations.cuh → ...end/cuda/src/types/complex/operations.cuh b/...entation/src/types/complex/operations.cuh → ...end/cuda/src/types/complex/operations.cuh
diff --git a/...ckend/implementation/src/types/int128.cuh → ...he-cuda-backend/cuda/src/types/int128.cuh b/...ckend/implementation/src/types/int128.cuh → ...he-cuda-backend/cuda/src/types/int128.cuh
diff --git a/...ckend/implementation/src/utils/helper.cuh → ...he-cuda-backend/cuda/src/utils/helper.cuh b/...ckend/implementation/src/utils/helper.cuh → ...he-cuda-backend/cuda/src/utils/helper.cuh
diff --git a/...mentation/src/utils/kernel_dimensions.cuh → ...kend/cuda/src/utils/kernel_dimensions.cuh b/...mentation/src/utils/kernel_dimensions.cuh → ...kend/cuda/src/utils/kernel_dimensions.cuh
diff --git a/...tfhe-cuda-backend/rust_api/get_os_name.sh → backends/tfhe-cuda-backend/get_os_name.sh b/...tfhe-cuda-backend/rust_api/get_os_name.sh → backends/tfhe-cuda-backend/get_os_name.sh
diff --git a/...he-cuda-backend/rust_api/src/cuda_bind.rs → backends/tfhe-cuda-backend/src/cuda_bind.rs b/...he-cuda-backend/rust_api/src/cuda_bind.rs → backends/tfhe-cuda-backend/src/cuda_bind.rs
diff --git a/...nds/tfhe-cuda-backend/rust_api/src/lib.rs → backends/tfhe-cuda-backend/src/lib.rs b/...nds/tfhe-cuda-backend/rust_api/src/lib.rs → backends/tfhe-cuda-backend/src/lib.rs
diff --git a/tfhe/Cargo.toml b/tfhe/Cargo.toml
@@ -62,7 +62,7 @@ rayon = { version = "1.5.0" }
 bincode = "1.3.3"
 concrete-fft = { version = "0.3.0", features = ["serde", "fft128"] }
 pulp = "0.13"
-tfhe-cuda-backend = {path = "../backends/tfhe-cuda-backend/rust_api", optional = true}
+tfhe-cuda-backend = {path = "../backends/tfhe-cuda-backend", optional = true}
 aligned-vec = { version = "0.5", features = ["serde"] }
 dyn-stack = { version = "0.9" }
 paste = "1.0.7"