From b6e0d70785f85e4a8b9ab61b37f684ad0eca4d28 Mon Sep 17 00:00:00 2001 From: Aleksei Gerasimov Date: Thu, 15 Oct 2020 14:13:11 +0200 Subject: disable ndimage diff --git a/scipy/setup.py b/scipy/setup.py index 3bcdd48..b3ede6f 100644 --- a/scipy/setup.py +++ b/scipy/setup.py @@ -21,7 +21,7 @@ def configuration(parent_package='',top_path=None): config.add_subpackage('spatial') config.add_subpackage('special') config.add_subpackage('stats') - config.add_subpackage('ndimage') + #config.add_subpackage('ndimage') config.add_subpackage('_build_utils') config.add_subpackage('_lib') config.make_config_py() -- 2.30.2 From f9e25e090297e27de3395bab18f104c70358d9ec Mon Sep 17 00:00:00 2001 From: begasus Date: Mon, 24 May 2021 18:40:26 +0000 Subject: Haiku doesn't use -pthread, use -lpthread instead diff --git a/scipy/fft/_pocketfft/setup.py b/scipy/fft/_pocketfft/setup.py index 7e44565..3b0ead2 100644 --- a/scipy/fft/_pocketfft/setup.py +++ b/scipy/fft/_pocketfft/setup.py @@ -15,9 +15,9 @@ def pre_build_hook(build_ext, ext): 'int main(int argc, char **argv) {}') if has_pthreads: ext.define_macros.append(('POCKETFFT_PTHREADS', None)) - if has_flag(cc, '-pthread'): - args.append('-pthread') - ext.extra_link_args.append('-pthread') + if has_flag(cc, '-lpthread'): + args.append('-lpthread') + ext.extra_link_args.append('-lpthread') else: raise RuntimeError("Build failed: System has pthreads header " "but could not compile with -pthread option") -- 2.30.2 From 0450b42c56cb1ed5d80a81447a766a4cfa757e63 Mon Sep 17 00:00:00 2001 From: Aleksei Gerasimov Date: Tue, 24 Aug 2021 15:19:52 +0200 Subject: comment out ndimage import. Only one function (_threshold_mgc_map) is directly affected. diff --git a/scipy/stats/stats.py b/scipy/stats/stats.py index 2b7dac8..c460637 100644 --- a/scipy/stats/stats.py +++ b/scipy/stats/stats.py @@ -172,7 +172,7 @@ import numpy as np from numpy import array, asarray, ma from scipy.spatial.distance import cdist -from scipy.ndimage import measurements +#from scipy.ndimage import measurements from scipy._lib._util import (_lazywhere, check_random_state, MapWrapper, rng_integers, float_factorial) import scipy.special as special @@ -5208,32 +5208,33 @@ def _threshold_mgc_map(stat_mgc_map, samp_size): sig_connect : ndarray A binary matrix with 1's indicating the significant region. """ - m, n = stat_mgc_map.shape - - # 0.02 is simply an empirical threshold, this can be set to 0.01 or 0.05 - # with varying levels of performance. Threshold is based on a beta - # approximation. - per_sig = 1 - (0.02 / samp_size) # Percentile to consider as significant - threshold = samp_size * (samp_size - 3)/4 - 1/2 # Beta approximation - threshold = distributions.beta.ppf(per_sig, threshold, threshold) * 2 - 1 - - # the global scale at is the statistic calculated at maximial nearest - # neighbors. Threshold is the maximium on the global and local scales - threshold = max(threshold, stat_mgc_map[m - 1][n - 1]) - - # find the largest connected component of significant correlations - sig_connect = stat_mgc_map > threshold - if np.sum(sig_connect) > 0: - sig_connect, _ = measurements.label(sig_connect) - _, label_counts = np.unique(sig_connect, return_counts=True) - - # skip the first element in label_counts, as it is count(zeros) - max_label = np.argmax(label_counts[1:]) + 1 - sig_connect = sig_connect == max_label - else: - sig_connect = np.array([[False]]) - - return sig_connect + raise ImportError("Haiku's package of scipy does not contain ndimage module") +# m, n = stat_mgc_map.shape +# +# # 0.02 is simply an empirical threshold, this can be set to 0.01 or 0.05 +# # with varying levels of performance. Threshold is based on a beta +# # approximation. +# per_sig = 1 - (0.02 / samp_size) # Percentile to consider as significant +# threshold = samp_size * (samp_size - 3)/4 - 1/2 # Beta approximation +# threshold = distributions.beta.ppf(per_sig, threshold, threshold) * 2 - 1 +# +# # the global scale at is the statistic calculated at maximial nearest +# # neighbors. Threshold is the maximium on the global and local scales +# threshold = max(threshold, stat_mgc_map[m - 1][n - 1]) +# +# # find the largest connected component of significant correlations +# sig_connect = stat_mgc_map > threshold +# if np.sum(sig_connect) > 0: +# sig_connect, _ = measurements.label(sig_connect) +# _, label_counts = np.unique(sig_connect, return_counts=True) +# +# # skip the first element in label_counts, as it is count(zeros) +# max_label = np.argmax(label_counts[1:]) + 1 +# sig_connect = sig_connect == max_label +# else: +# sig_connect = np.array([[False]]) +# +# return sig_connect def _smooth_mgc_map(sig_connect, stat_mgc_map): -- 2.30.2