@sjcrh/proteinpaint-rust 2.120.0 → 2.120.2-0

package/index.js

@@ -1,3 +1,4 @@
+const fs = require('fs')
 const path = require('path'),
 	{ spawn, exec } = require('child_process'),
 	Readable = require('stream').Readable,
@@ -6,6 +7,11 @@ const path = require('path'),
 
 const execPromise = promisify(exec)
 
+// check if rust binary directory exists and is not empty
+const binaryDir = path.join(__dirname, '/target/release/')
+if (!fs.existsSync(binaryDir)) throw `missing rust binary directory='${binaryDir}'`
+if (!fs.readdirSync(binaryDir).length) throw `empty rust binary directory='${binaryDir}'`
+
 exports.run_rust = function (binfile, input_data) {
 	return new Promise((resolve, reject) => {
 		const binpath = path.join(__dirname, '/target/release/', binfile)

package/package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.120.0",
+	"version": "2.120.2-0",
 	"name": "@sjcrh/proteinpaint-rust",
 	"description": "Rust-based utilities for proteinpaint",
 	"main": "index.js",
@@ -38,5 +38,5 @@
 	"devDependencies": {
 		"tape": "^5.2.2"
 	},
-	"pp_release_tag": "v2.120.0"
+	"pp_release_tag": "v2.120.2-0"
 }

package/src/DEanalysis.rs

@@ -664,6 +664,14 @@ fn main() {
                                 //println!("filtering time:{:?}", filtering_time.elapsed());
                                 //println!("filtered_matrix_rows:{:?}", filtered_matrix.nrows());
                                 //println!("filtered_matrix_cols:{:?}", filtered_matrix.ncols());
+                                if filtered_matrix.nrows() == 0 {
+                                    // Its possible after filtering there might not be any genes left in the matrix, in such a case the rust code must exit gracefully with an error.
+                                    panic!("Number of genes after filtering = 0, cannot proceed any further")
+                                }
+                                if filtered_matrix.ncols() == 0 {
+                                    // Its possible after filtering there might not be any samples left in the matrix, in such a case the rust code must exit gracefully with an error.
+                                    panic!("Number of samples after filtering = 0, cannot proceed any further")
+                                }
                                 //let cpm_normalization_time = Instant::now();
                                 let mut normalized_matrix = cpm(&filtered_matrix);
                                 //println!(
@@ -1214,7 +1222,6 @@ fn calc_factor_quantile(
         for i in 0..input_matrix.nrows() {
             row_vec.push(input_matrix[(i, j)] as f64);
         }
-        //println!("row_vec:{:?}", row_vec);
         let quan = calc_quantile(row_vec, P);
         //println!("quan:{}", quan);
         let num = quan / lib_sizes[j];