Skip to content

Commit f571787

Browse files
committed
fix bug due to np version change
1 parent deb5a1a commit f571787

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

tpcav/cavs.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from torch.utils.data import DataLoader, TensorDataset, random_split
2828
from sklearn.linear_model import LinearRegression
2929
from sklearn.model_selection import train_test_split
30+
from packaging.version import Version
3031
import logomaker
3132
import multiprocessing as mp
3233

@@ -808,9 +809,14 @@ def compute_motif_auc_fscore(num_motif_insertions: List[int], cav_trainers: List
808809

809810
def compute_auc_fscore(row):
810811
y = [row[f"fscore_{nm}_insertions"] for nm in num_motif_insertions]
811-
return np.trapz(y, num_motif_insertions) / (
812-
num_motif_insertions[-1] - num_motif_insertions[0]
813-
)
812+
if Version(np.__version__) < Version("2.0.0"):
813+
return np.trapz(y, num_motif_insertions) / (
814+
num_motif_insertions[-1] - num_motif_insertions[0]
815+
)
816+
else:
817+
return np.trapezoid(y, num_motif_insertions) / (
818+
num_motif_insertions[-1] - num_motif_insertions[0]
819+
)
814820

815821
cavs_fscores_df["AUC_fscores"] = cavs_fscores_df.apply(compute_auc_fscore, axis=1)
816822

0 commit comments

Comments
 (0)