8000 Don't export modules if CIRCUITPY · adafruit/circuitpython-ulab@f6d123b · GitHub 8000
[go: up one dir, main page]
Skip to content

Commit f6d123b

Browse files
jeplerjepler
committed
Don't export modules if CIRCUITPY
.. We are using the "shared bindings" method of circuitpython
1 parent 27996c9 commit f6d123b

File tree

7 files changed

+19
-5
lines changed

7 files changed

+19
-5
lines changed

‎code/fft.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ mp_obj_t fft_spectrum(size_t n_args, const mp_obj_t *args) {
182182

183183
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(fft_spectrum_obj, 1, 2, fft_spectrum);
184184

185+
#if !CIRCUITPY
185186
STATIC const mp_rom_map_elem_t ulab_fft_globals_table[] = {
186187
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_fft) },
187188
{ MP_OBJ_NEW_QSTR(MP_QSTR_fft), (mp_obj_t)&fft_fft_obj },
@@ -191,9 +192,10 @@ STATIC const mp_rom_map_elem_t ulab_fft_globals_table[] = {
191192

192193
STATIC MP_DEFINE_CONST_DICT(mp_module_ulab_fft_globals, ulab_fft_globals_table);
193194

194-
mp_obj_module_t ulab_fft_module = {
195+
const mp_obj_module_t ulab_fft_module = {
195196
.base = { &mp_type_module },
196197
.globals = (mp_obj_dict_t*)&mp_module_ulab_fft_globals,
197198
};
199+
#endif
198200

199201
#endif

‎code/filter.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,18 @@ mp_obj_t filter_convolve(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_a
8484

8585
MP_DEFINE_CONST_FUN_OBJ_KW(filter_convolve_obj, 2, filter_convolve);
8686

87+
#if !CIRCUITPY
8788
STATIC const mp_rom_map_elem_t ulab_filter_globals_table[] = {
8889
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_filter) },
8990
{ MP_OBJ_NEW_QSTR(MP_QSTR_convolve), (mp_obj_t)&filter_convolve_obj },
9091
};
9192

9293
STATIC MP_DEFINE_CONST_DICT(mp_module_ulab_filter_globals, ulab_filter_globals_table);
9394

94-
mp_obj_module_t ulab_filter_module = {
95+
const mp_obj_module_t ulab_filter_module = {
9596
.base = { &mp_type_module },
9697
.globals = (mp_obj_dict_t*)&mp_module_ulab_filter_globals,
9798
};
99+
#endif
98100

99101
#endif

‎code/linalg.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ mp_obj_t linalg_eig(mp_obj_t oin) {
424424

425425
MP_DEFINE_CONST_FUN_OBJ_1(linalg_eig_obj, linalg_eig);
426426

427+
#if !CIRCUITPY
427428
STATIC const mp_rom_map_elem_t ulab_linalg_globals_table[] = {
428429
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_linalg) },
429430
{ MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t)&linalg_size_obj },
@@ -438,9 +439,10 @@ STATIC const mp_rom_map_elem_t ulab_linalg_globals_table[] = {
438439

439440
STATIC MP_DEFINE_CONST_DICT(mp_module_ulab_linalg_globals, ulab_linalg_globals_table);
440441

441-
mp_obj_module_t ulab_linalg_module = {
442+
const mp_obj_module_t ulab_linalg_module = {
442443
.base = { &mp_type_module },
443444
.globals = (mp_obj_dict_t*)&mp_module_ulab_linalg_globals,
444445
};
446+
#endif
445447

446448
#endif

‎code/numerical.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,7 @@ mp_obj_t numerical_argsort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw
730730

731731
MP_DEFINE_CONST_FUN_OBJ_KW(numerical_argsort_obj, 1, numerical_argsort);
732732

733+
#if !CIRCUITPY
733734
STATIC const mp_rom_map_elem_t ulab_numerical_globals_table[] = {
734735
{ MP_OBJ_NEW_QSTR(MP_QSTR_linspace), (mp_obj_t)&numerical_linspace_obj },
735736
{ MP_OBJ_NEW_QSTR(MP_QSTR_sum), (mp_obj_t)&numerical_sum_obj },
@@ -748,9 +749,10 @@ STATIC const mp_rom_map_elem_t ulab_numerical_globals_table[] = {
748749

749750
STATIC MP_DEFINE_CONST_DICT(mp_module_ulab_numerical_globals, ulab_numerical_globals_table);
750751

751-
mp_obj_module_t ulab_numerical_module = {
752+
const mp_obj_module_t ulab_numerical_module = {
752753
.base = { &mp_type_module },
753754
.globals = (mp_obj_dict_t*)&mp_module_ulab_numerical_globals,
754755
};
756+
#endif
755757

756758
#endif

‎code/poly.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ mp_obj_t poly_polyfit(size_t n_args, const mp_obj_t *args) {
197197

198198
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poly_polyfit_obj, 2, 3, poly_polyfit);
199199

200+
#if !CIRCUITPY
200201
STATIC const mp_rom_map_elem_t ulab_poly_globals_table[] = {
201202
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_poly) },
202203
{ MP_OBJ_NEW_QSTR(MP_QSTR_polyval), (mp_obj_t)&poly_polyval_obj },
@@ -205,9 +206,10 @@ STATIC const mp_rom_map_elem_t ulab_poly_globals_table[] = {
205206

206207
STATIC MP_DEFINE_CONST_DICT(mp_module_ulab_poly_globals, ulab_poly_globals_table);
207208

208-
mp_obj_module_t ulab_poly_module = {
209+
const mp_obj_module_t ulab_poly_module = {
209210
.base = { &mp_type_module },
210211
.globals = (mp_obj_dict_t*)&mp_module_ulab_poly_globals,
211212
};
213+
#endif
212214

213215
#endif

‎code/ulab.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ const mp_obj_type_t ulab_ndarray_type = {
5656
.locals_dict = (mp_obj_dict_t*)&ulab_ndarray_locals_dict,
5757
};
5858

59+
#if !CIRCUITPY
5960
STATIC const mp_map_elem_t ulab_globals_table[] = {
6061
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_ulab) },
6162
{ MP_ROM_QSTR(MP_QSTR___version__), MP_ROM_PTR(&ulab_version_obj) },
@@ -100,3 +101,4 @@ const mp_obj_module_t ulab_user_cmodule = {
100101
};
101102

102103
MP_REGISTER_MODULE(MP_QSTR_ulab, ulab_user_cmodule, 8000 MODULE_ULAB_ENABLED);
104+
#endif

‎code/vectorise.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(vectorise_tan_obj, vectorise_tan);
135135
MATH_FUN_1(tanh, tanh);
136136
MP_DEFINE_CONST_FUN_OBJ_1(vectorise_tanh_obj, vectorise_tanh);
137137

138+
#if !CIRCUITPY
138139
STATIC const mp_rom_map_elem_t ulab_vectorise_globals_table[] = {
139140
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_vector) },
140141
{ MP_OBJ_NEW_QSTR(MP_QSTR_acos), (mp_obj_t)&vectorise_acos_obj },
@@ -168,5 +169,6 @@ mp_obj_module_t ulab_vectorise_module = {
168169
.base = { &mp_type_module },
169170
.globals = (mp_obj_dict_t*)&mp_module_ulab_vectorise_globals,
170171
};
172+
#endif
171173

172174
#endif

0 commit comments

Comments
 (0)
0