diff --git a/.github/workflows/nestml-build.yml b/.github/workflows/nestml-build.yml index 6b3c7400f..31a8b124b 100644 --- a/.github/workflows/nestml-build.yml +++ b/.github/workflows/nestml-build.yml @@ -121,10 +121,6 @@ jobs: build_and_test_nest_desktop: needs: [static_checks] runs-on: ubuntu-latest - strategy: - matrix: - nest_branch: [ "master" ] - fail-fast: false steps: # Checkout the repository contents - name: Checkout NESTML code @@ -149,23 +145,6 @@ jobs: python -m pip install --upgrade pip pytest jupyterlab matplotlib pycodestyle scipy python -m pip install -r requirements.txt - - name: NEST simulator - run: | - python -m pip install cython - echo "GITHUB_WORKSPACE = $GITHUB_WORKSPACE" - NEST_SIMULATOR=$(pwd)/nest-simulator - NEST_INSTALL=$(pwd)/nest_install - echo "NEST_SIMULATOR = $NEST_SIMULATOR" - echo "NEST_INSTALL = $NEST_INSTALL" - - git clone --depth=1 https://github.com/nest/nest-simulator --branch ${{ matrix.nest_branch }} - mkdir nest_install - echo "NEST_INSTALL=$NEST_INSTALL" >> $GITHUB_ENV - cd nest_install - cmake -DCMAKE_INSTALL_PREFIX=$NEST_INSTALL $NEST_SIMULATOR - make && make install - cd .. - # Install NESTML - name: Install NESTML run: | diff --git a/pynestml/codegeneration/python_standalone_target_tools.py b/pynestml/codegeneration/python_standalone_target_tools.py index 7c0af5495..425e28ab1 100644 --- a/pynestml/codegeneration/python_standalone_target_tools.py +++ b/pynestml/codegeneration/python_standalone_target_tools.py @@ -44,7 +44,7 @@ def _get_model_parameters_and_state(cls, model_name: str): module_name=module_name, logging_level="INFO") - py_module_name = "nest_desktop_module." + model_name + suffix + py_module_name = module_name + "." + model_name + suffix module = importlib.import_module(py_module_name) neuron_name = "Neuron_" + model_name + suffix + "(1.0)" neuron = eval("module." + neuron_name)