fix

daniellga · Jun 18, 2024 · 159a6f8 · 159a6f8
1 parent 52a3f11
commit 159a6f8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 93 deletions.
diff --git a/r-harmonium/R/000-wrappers.R b/r-harmonium/R/000-wrappers.R
@@ -457,55 +457,6 @@ HDecoderStream <- new.env(parent = emptyenv())
 
 
 
-### wrapper functions for HFft
-
-
-.savvy_wrap_HFft <- function(ptr) {
-  e <- new.env(parent = emptyenv())
-  e$.ptr <- ptr
-
-
-  class(e) <- "HFft"
-  e
-}
-
-
-
-HFft <- new.env(parent = emptyenv())
-
-### associated functions for HFft
-
-HFft$fft <- function(harray) {
-  harray <- .savvy_extract_ptr(harray, "HArray")
-  .savvy_wrap_HArray(.Call(savvy_HFft_fft__impl, harray))
-}
-
-HFft$fft_mut <- function(harray) {
-  harray <- .savvy_extract_ptr(harray, "HArray")
-invisible(.Call(savvy_HFft_fft_mut__impl, harray))
-}
-
-HFft$ifft <- function(harray) {
-  harray <- .savvy_extract_ptr(harray, "HArray")
-  .savvy_wrap_HArray(.Call(savvy_HFft_ifft__impl, harray))
-}
-
-HFft$ifft_mut <- function(harray) {
-  harray <- .savvy_extract_ptr(harray, "HArray")
-invisible(.Call(savvy_HFft_ifft_mut__impl, harray))
-}
-
-HFft$rfft_mut <- function(harray) {
-  harray <- .savvy_extract_ptr(harray, "HArray")
-invisible(.Call(savvy_HFft_rfft_mut__impl, harray))
-}
-
-HFft$irfft_mut <- function(harray, length) {
-  harray <- .savvy_extract_ptr(harray, "HArray")
-invisible(.Call(savvy_HFft_irfft_mut__impl, harray, length))
-}
-
-
 ### wrapper functions for HFftPlanner
 
 HFftPlanner_fft <- function(self) {

diff --git a/r-harmonium/src/init.c b/r-harmonium/src/init.c
@@ -260,36 +260,6 @@ SEXP savvy_HDecoderStream_stream__impl(SEXP self__) {
     return handle_result(res);
 }
 
-SEXP savvy_HFft_fft__impl(SEXP harray) {
-    SEXP res = savvy_HFft_fft__ffi(harray);
-    return handle_result(res);
-}
-
-SEXP savvy_HFft_fft_mut__impl(SEXP harray) {
-    SEXP res = savvy_HFft_fft_mut__ffi(harray);
-    return handle_result(res);
-}
-
-SEXP savvy_HFft_ifft__impl(SEXP harray) {
-    SEXP res = savvy_HFft_ifft__ffi(harray);
-    return handle_result(res);
-}
-
-SEXP savvy_HFft_ifft_mut__impl(SEXP harray) {
-    SEXP res = savvy_HFft_ifft_mut__ffi(harray);
-    return handle_result(res);
-}
-
-SEXP savvy_HFft_rfft_mut__impl(SEXP harray) {
-    SEXP res = savvy_HFft_rfft_mut__ffi(harray);
-    return handle_result(res);
-}
-
-SEXP savvy_HFft_irfft_mut__impl(SEXP harray, SEXP length) {
-    SEXP res = savvy_HFft_irfft_mut__ffi(harray, length);
-    return handle_result(res);
-}
-
 SEXP savvy_HFftPlanner_new__impl(SEXP dtype) {
     SEXP res = savvy_HFftPlanner_new__ffi(dtype);
     return handle_result(res);
@@ -588,12 +558,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"savvy_HDecodedAudio_sr__impl", (DL_FUNC) &savvy_HDecodedAudio_sr__impl, 1},
     {"savvy_HDecodedAudio_invalidate__impl", (DL_FUNC) &savvy_HDecodedAudio_invalidate__impl, 1},
     {"savvy_HDecoderStream_stream__impl", (DL_FUNC) &savvy_HDecoderStream_stream__impl, 1},
-    {"savvy_HFft_fft__impl", (DL_FUNC) &savvy_HFft_fft__impl, 1},
-    {"savvy_HFft_fft_mut__impl", (DL_FUNC) &savvy_HFft_fft_mut__impl, 1},
-    {"savvy_HFft_ifft__impl", (DL_FUNC) &savvy_HFft_ifft__impl, 1},
-    {"savvy_HFft_ifft_mut__impl", (DL_FUNC) &savvy_HFft_ifft_mut__impl, 1},
-    {"savvy_HFft_rfft_mut__impl", (DL_FUNC) &savvy_HFft_rfft_mut__impl, 1},
-    {"savvy_HFft_irfft_mut__impl", (DL_FUNC) &savvy_HFft_irfft_mut__impl, 2},
     {"savvy_HFftPlanner_new__impl", (DL_FUNC) &savvy_HFftPlanner_new__impl, 1},
     {"savvy_HFftPlanner_fft__impl", (DL_FUNC) &savvy_HFftPlanner_fft__impl, 2},
     {"savvy_HFftPlanner_ifft__impl", (DL_FUNC) &savvy_HFftPlanner_ifft__impl, 2},

diff --git a/r-harmonium/src/rust/api.h b/r-harmonium/src/rust/api.h
@@ -57,14 +57,6 @@ SEXP savvy_HDecodedAudio_invalidate__ffi(SEXP self__);
 // methods and associated functions for HDecoderStream
 SEXP savvy_HDecoderStream_stream__ffi(SEXP self__);
 
-// methods and associated functions for HFft
-SEXP savvy_HFft_fft__ffi(SEXP harray);
-SEXP savvy_HFft_fft_mut__ffi(SEXP harray);
-SEXP savvy_HFft_ifft__ffi(SEXP harray);
-SEXP savvy_HFft_ifft_mut__ffi(SEXP harray);
-SEXP savvy_HFft_rfft_mut__ffi(SEXP harray);
-SEXP savvy_HFft_irfft_mut__ffi(SEXP harray, SEXP length);
-
 // methods and associated functions for HFftPlanner
 SEXP savvy_HFftPlanner_new__ffi(SEXP dtype);
 SEXP savvy_HFftPlanner_fft__ffi(SEXP self__, SEXP harray);