Skip to content
This repository has been archived by the owner on Jul 15, 2021. It is now read-only.

Inplace #47

Merged
merged 6 commits into from
Dec 5, 2020
Merged

Inplace #47

merged 6 commits into from
Dec 5, 2020

Conversation

jjpr-mit
Copy link
Contributor

@jjpr-mit jjpr-mit commented Nov 9, 2020

No description provided.

…eset_index works on DataAssembly since the inplace argument removal changes.
* master:
  dicarlo.Seibert2019 (#48)

# Conflicts:
#	tests/test_assemblies.py
@jjpr-mit jjpr-mit requested a review from mschrimpf December 4, 2020 20:28
@mschrimpf
Copy link
Member

re-trigger jenkins

@mschrimpf mschrimpf closed this Dec 5, 2020
@mschrimpf mschrimpf reopened this Dec 5, 2020
@jjpr-mit jjpr-mit merged commit 6d6ab18 into master Dec 5, 2020
@mschrimpf mschrimpf deleted the inplace branch December 5, 2020 14:34
jjpr-mit added a commit that referenced this pull request Jan 20, 2021
Also fix tests for dicarlo.BashivanKar2019 as only two assemblies

* master:
  Rust305 (#51)
  Fix Kuzovkin 2018 (#50)
  Inplace (#47)
  dicarlo.Seibert2019 (#48)
  add ImageNet stimulus set (#45)
  Created exceptions in fetch and packaging for PropertyAssembly class that do not merge responses with stimulus_set (#42)
  Update lookup.csv (#44)
  Update Rajalingham2020 lookup (#43)
  Update lookup.csv (#41)
  use image_file_name without .png if present (#40)

# Conflicts:
#	tests/test_assemblies.py
#	tests/test_stimuli.py
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants