Skip to content

Commit 3884875

Browse files
authored
PRO-121: Remove progress estimation (#868)
* Removed enable_progress_estimation parameter from Python API * Removed setEnableProgressEstimation method from Java API * Removed support for progress estimation from C API * Removed --enable-progress-estimation flag from CLI * Removed enable_progress_estimation member from Reader class
1 parent 2e04999 commit 3884875

13 files changed

Lines changed: 5 additions & 169 deletions

File tree

apis/java/src/main/java/io/tiledb/libvcfnative/LibVCFNative.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -881,24 +881,6 @@ Java_io_tiledb_libvcfnative_LibVCFNative_tiledb_1vcf_1bed_1file_1get_1last_1erro
881881
return result;
882882
}
883883

884-
JNIEXPORT jint JNICALL
885-
Java_io_tiledb_libvcfnative_LibVCFNative_tiledb_1vcf_1reader_1set_1enable_1progress_1estimation(
886-
JNIEnv* env,
887-
jclass self,
888-
jlong readerPtr,
889-
jboolean enableProgressEstimation) {
890-
(void)self;
891-
tiledb_vcf_reader_t* reader = (tiledb_vcf_reader_t*)readerPtr;
892-
if (reader == 0) {
893-
return TILEDB_VCF_ERR;
894-
}
895-
896-
int32_t rc = tiledb_vcf_reader_set_enable_progress_estimation(
897-
reader, enableProgressEstimation);
898-
899-
return rc;
900-
}
901-
902884
JNIEXPORT jint JNICALL
903885
Java_io_tiledb_libvcfnative_LibVCFNative_tiledb_1vcf_1reader_1set_1debug_1print_1vcf_1regions(
904886
JNIEnv* env, jclass self, jlong readerPtr, jboolean printVCFRegions) {

apis/java/src/main/java/io/tiledb/libvcfnative/LibVCFNative.h

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/java/src/main/java/io/tiledb/libvcfnative/LibVCFNative.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ public static final native int tiledb_vcf_reader_set_tiledb_stats_enabled(
133133

134134
public static final native String tiledb_vcf_version();
135135

136-
public static final native int tiledb_vcf_reader_set_enable_progress_estimation(
137-
long readerPtr, boolean enableProgressEstimation);
138-
139136
public static final native int tiledb_vcf_reader_set_debug_print_vcf_regions(
140137
long readerPtr, boolean printVCFRegions);
141138

apis/java/src/main/java/io/tiledb/libvcfnative/VCFReader.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -588,17 +588,6 @@ public String version() {
588588
return LibVCFNative.tiledb_vcf_version();
589589
}
590590

591-
public VCFReader setEnableProgressEstimation(boolean enableProgressEstimation) {
592-
int rc =
593-
LibVCFNative.tiledb_vcf_reader_set_enable_progress_estimation(
594-
this.readerPtr, enableProgressEstimation);
595-
if (rc != 0) {
596-
String msg = getLastErrorMessage();
597-
throw new RuntimeException("Error setting enableProgressEstimation: " + msg);
598-
}
599-
return this;
600-
}
601-
602591
public VCFReader setDebugPrintVCFRegions(boolean debugPrintVCFRegions) {
603592
int rc =
604593
LibVCFNative.tiledb_vcf_reader_set_debug_print_vcf_regions(

apis/python/src/tiledbvcf/binding/libtiledbvcf.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ PYBIND11_MODULE(libtiledbvcf, m) {
9494
&Reader::set_tiledb_tile_cache_percentage)
9595
.def("set_check_samples_exist", &Reader::set_check_samples_exist)
9696
.def("version", &Reader::version)
97-
.def(
98-
"set_enable_progress_estimation",
99-
&Reader::set_enable_progress_estimation)
10097
.def("set_debug_print_vcf_regions", &Reader::set_debug_print_vcf_regions)
10198
.def("set_debug_print_sample_list", &Reader::set_debug_print_sample_list)
10299
.def(

apis/python/src/tiledbvcf/binding/reader.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -616,15 +616,6 @@ std::string Reader::version() {
616616
return version_str;
617617
}
618618

619-
void Reader::set_enable_progress_estimation(
620-
const bool& enable_progress_estimation) {
621-
auto reader = ptr.get();
622-
check_error(
623-
reader,
624-
tiledb_vcf_reader_set_enable_progress_estimation(
625-
reader, enable_progress_estimation));
626-
}
627-
628619
void Reader::set_debug_print_vcf_regions(const bool& print_vcf_regions) {
629620
auto reader = ptr.get();
630621
check_error(

apis/python/src/tiledbvcf/binding/reader.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,6 @@ class Reader {
172172
/** Get Version info for TileDB VCF and TileDB. */
173173
std::string version();
174174

175-
/** Set disable progress estimation */
176-
void set_enable_progress_estimation(const bool& enable_progress_estimation);
177-
178175
/** Set print vcf regions in verbose mode */
179176
void set_debug_print_vcf_regions(const bool& print_vcf_regions);
180177

apis/python/src/tiledbvcf/dataset.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ def read_arrow(
283283
skip_check_samples: bool = False,
284284
set_af_filter: str = "",
285285
scan_all_samples: bool = False,
286-
enable_progress_estimation: bool = False,
287286
) -> pa.Table:
288287
"""
289288
Read data from the dataset into a PyArrow Table.
@@ -312,8 +311,6 @@ def read_arrow(
312311
variants with AF > 0.1, set this to ">0.1".
313312
scan_all_samples
314313
Scan all samples when computing internal allele frequency.
315-
enable_progress_estimation
316-
**DEPRECATED** - This parameter will be removed in a future release.
317314
318315
Returns
319316
-------
@@ -342,7 +339,6 @@ def read_arrow(
342339
self.reader.set_check_samples_exist(not skip_check_samples)
343340
self.reader.set_af_filter(set_af_filter)
344341
self.reader.set_scan_all_samples(scan_all_samples)
345-
self.reader.set_enable_progress_estimation(enable_progress_estimation)
346342

347343
if bed_file is not None:
348344
self.reader.set_bed_file(bed_file)
@@ -534,7 +530,6 @@ def read(
534530
skip_check_samples: bool = False,
535531
set_af_filter: str = "",
536532
scan_all_samples: bool = False,
537-
enable_progress_estimation: bool = False,
538533
) -> pd.DataFrame:
539534
"""
540535
Read data from the dataset into a Pandas DataFrame.
@@ -563,8 +558,6 @@ def read(
563558
set_af_filter
564559
Filter variants by internal allele frequency. For example, to include
565560
variants with AF > 0.1, set this to ">0.1".
566-
enable_progress_estimation
567-
**DEPRECATED** - This parameter will be removed in a future release.
568561
569562
Returns
570563
-------
@@ -592,7 +585,6 @@ def read(
592585
self.reader.set_check_samples_exist(not skip_check_samples)
593586
self.reader.set_af_filter(set_af_filter)
594587
self.reader.set_scan_all_samples(scan_all_samples)
595-
self.reader.set_enable_progress_estimation(enable_progress_estimation)
596588

597589
if bed_file is not None:
598590
self.reader.set_bed_file(bed_file)
@@ -606,7 +598,6 @@ def export(
606598
samples_file: str = None,
607599
bed_file: str = None,
608600
skip_check_samples: bool = False,
609-
enable_progress_estimation: bool = False,
610601
merge: bool = False,
611602
output_format: str = "z",
612603
output_path: str = "",
@@ -632,8 +623,6 @@ def export(
632623
variants with AF > 0.1, set this to ">0.1".
633624
scan_all_samples
634625
Scan all samples when computing internal allele frequency.
635-
enable_progress_estimation
636-
**DEPRECATED** - This parameter will be removed in a future release.
637626
merge
638627
Merge samples to create a combined VCF file.
639628
output_format
@@ -661,7 +650,6 @@ def export(
661650

662651
self.reader.set_regions(",".join(regions))
663652
self.reader.set_check_samples_exist(not skip_check_samples)
664-
self.reader.set_enable_progress_estimation(enable_progress_estimation)
665653
self.reader.set_merge(merge)
666654
self.reader.set_output_format(output_format)
667655
self.reader.set_output_path(output_path)

libtiledbvcf/src/c_api/tiledbvcf.cc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -783,20 +783,6 @@ int32_t tiledb_vcf_reader_set_verbose(
783783
return TILEDB_VCF_OK;
784784
}
785785

786-
int32_t tiledb_vcf_reader_set_enable_progress_estimation(
787-
tiledb_vcf_reader_t* reader, bool enable_progress_estimation) {
788-
if (sanity_check(reader) == TILEDB_VCF_ERR)
789-
return TILEDB_VCF_ERR;
790-
791-
if (SAVE_ERROR_CATCH(
792-
reader,
793-
reader->reader_->set_enable_progress_estimation(
794-
enable_progress_estimation)))
795-
return TILEDB_VCF_ERR;
796-
797-
return TILEDB_VCF_OK;
798-
}
799-
800786
int32_t tiledb_vcf_reader_set_buffer_percentage(
801787
tiledb_vcf_reader_t* reader, const float buffer_percentage) {
802788
if (sanity_check(reader) == TILEDB_VCF_ERR)

libtiledbvcf/src/c_api/tiledbvcf.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,14 +1013,6 @@ TILEDBVCF_EXPORT int32_t tiledb_vcf_reader_read_from_allele_count(
10131013
TILEDBVCF_EXPORT int32_t tiledb_vcf_reader_set_output_dir(
10141014
tiledb_vcf_reader_t* reader, const char* output_dir);
10151015

1016-
/**
1017-
* Sets verbose mode on or off
1018-
* @param reader VCF reader object
1019-
* @param verbose setting
1020-
*/
1021-
TILEDBVCF_EXPORT int32_t tiledb_vcf_reader_set_enable_progress_estimation(
1022-
tiledb_vcf_reader_t* reader, bool enable_progress_estimation);
1023-
10241016
/**
10251017
* Sets the percentage of buffer size to tiledb memory budget
10261018
* @param reader VCF reader object

0 commit comments

Comments
 (0)