Skip to content

Commit 1283bd7

Browse files
committed
Remove remaining references to weave
1 parent 5587420 commit 1283bd7

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

brian2/codegen/runtime/cython_rt/templates/group_variable_get_conditional.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
{% block maincode %}
66

7-
{# This is copied from the weave equivalent, seems to work but confusing #}
87
{%set c_type = cpp_dtype(variables['_variable'].dtype) %}
98
{%set np_type = numpy_dtype(variables['_variable'].dtype) %}
109

brian2/core/preferences.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ def parse_preference_name(name):
3131
3232
Examples
3333
--------
34-
>>> parse_preference_name('core.weave_compiler')
35-
('core', 'weave_compiler')
34+
>>> parse_preference_name('core.default_float_dtype')
35+
('core', 'default_float_dtype')
3636
>>> parse_preference_name('codegen.cpp.compiler')
3737
('codegen.cpp', 'compiler')
3838
'''

docs_sphinx/developer/GSL.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ Return value of the StateUpdateMethod
7373
So far, for each each code generation language (numpy, cython) there was just
7474
one set of rules of how to translate abstract code to real code, described in
7575
its respective `CodeObject` and `CodeGenerator`. If the target language is set
76-
to weave, the stateupdater will use the `WeaveCodeObject`, just like other
76+
to Cython, the stateupdater will use the `CythonCodeObject`, just like other
7777
objects such as the `StateMonitor`. However, to achieve the above decribed
7878
translations of the abstract code generated by the `StateUpdateMethod`, we
79-
need a special `WeaveCodeObject` for the stateupdater alone (which at its turn
79+
need a special `CythonCodeObject` for the stateupdater alone (which at its turn
8080
can contain the special `CodeGenerator`), and this `CodeObject` should be
8181
selected based on the chosen `StateUpdateMethod`.
8282

docs_sphinx/developer/functions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To add a new implementation for a code generation target, a
1212
`FunctionImplementation` can be added to the `Function.implementations`
1313
dictionary. The key for this dictionary has to be either a `CodeGenerator` class
1414
object, or a `CodeObject` class object. The `CodeGenerator` of a `CodeObject`
15-
(e.g. `CPPCodeGenerator` for `WeaveCodeObject`) is used as a fallback if no
15+
(e.g. `CPPCodeGenerator` for `CPPStandaloneCodeObject`) is used as a fallback if no
1616
implementation specific to the `CodeObject` class exists.
1717

1818
If a function is already provided for the target language (e.g. it is part of

docs_sphinx/introduction/brian1_to_2/preferences.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ Preference name changes
4040

4141
* ``defaultclock``: removed because it led to unclear behaviour of scripts.
4242
* ``useweave_linear_diffeq``: removed because it was no longer relevant.
43-
* ``useweave``: now replaced by `codegen.target`.
43+
* ``useweave``: now replaced by `codegen.target` (but note that weave is no longer
44+
supported in Brian 2, use Cython instead).
4445
* ``weavecompiler``: now replaced by `codegen.cpp.compiler`.
4546
* ``gcc_options``: now replaced by `codegen.cpp.extra_compile_args_gcc`.
4647
* ``openmp``: now replaced by `devices.cpp_standalone.openmp_threads`.

0 commit comments

Comments
 (0)