Skip to content

Drop librosa dependency and refactor requirements files #378#386

Merged
mpariente merged 17 commits intomasterfrom
julius
Jan 8, 2021
Merged

Drop librosa dependency and refactor requirements files #378#386
mpariente merged 17 commits intomasterfrom
julius

Conversation

@jonashaag
Copy link
Collaborator

  • Use julius for resampling
  • Add optional librosa support for file_separate
  • Refactor file_separate

TODO: Fix librosa usage in one notebook

@jonashaag
Copy link
Collaborator Author

Shall we add soundfile to the Torch test dependencies?

Copy link
Collaborator

@mpariente mpariente left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is prettier this way, cool!

@mpariente
Copy link
Collaborator

Shall we add soundfile to the Torch test dependencies?

Yes. For the torch.hub tests as well then.

@mpariente
Copy link
Collaborator

There is a mismatch between the requirements filenames (test vs dev).

@jonashaag
Copy link
Collaborator Author

OK, will fix that notebook. Are you ok with the requirements changes? (No actual changes to requirements except librosa, only moved them to files)

@mpariente
Copy link
Collaborator

I like the split, but I wonder if we don't make a requirements folder to put all the files in, what's your take on that?

@jonashaag
Copy link
Collaborator Author

yeah why not, we could also move the docs requirements there:

requirements/
  requirements.txt
  requirements_dev.txt
  requirements_test.txt
  requirements_docs.txt

Or?

requirements/
  default.txt
  dev.txt
  test.txt
  docs.txt

@mpariente
Copy link
Collaborator

Yes.
Option 2 for me

@jonashaag jonashaag changed the title Drop librosa dependency #378 Drop librosa dependency and refactor requirements files #378 Dec 11, 2020
@mpariente
Copy link
Collaborator

LGTM
Only librosa to install at the beginning of the notebook right?

@jonashaag
Copy link
Collaborator Author

LGTM
Only librosa to install at the beginning of the notebook right?

I think so

@jonashaag
Copy link
Collaborator Author

When I change the notebook the diff is huge (almost the entire notebook JSON), is this expected? I'll upload the version I wanted to commit

@jonashaag
Copy link
Collaborator Author

Stupid GitHub does not allow ipynb

00_GettingStarted.ipynb.zip

@mpariente
Copy link
Collaborator

Yes, this is expected..
That's why nbdev uses something like nbdiff.
Did you rerun the notebook?

@mpariente
Copy link
Collaborator

librosa should be installed at the begining of the notebook right?

@jonashaag
Copy link
Collaborator Author

I didn't rerun it.

I deliberately moved the librosa import to the visualisation part and used soundfile for loading the example waveform to show that you don't need librosa.

@mpariente
Copy link
Collaborator

But then it's not installed right for the visualization right?
The notebook should be ran again IMO

@jonashaag
Copy link
Collaborator Author

Ran it again and did some changes to the text regarding Zenodo. https://colab.research.google.com/drive/1_2Dbd0lXcSbaTjzUKtdmFtfV_Y_2QPYX?usp=sharing

@mpariente
Copy link
Collaborator

Cannot open the colab

image

@mpariente
Copy link
Collaborator

Let's fix the tests and merge this.

@jonashaag
Copy link
Collaborator Author

Oh no I deleted that Google account recently 🤦‍♂️ Gotta redo the changes

@jonashaag
Copy link
Collaborator Author

I think this should be good now

@mpariente mpariente merged commit 91b9e4d into master Jan 8, 2021
@mpariente mpariente deleted the julius branch January 8, 2021 13:55
@mpariente
Copy link
Collaborator

The diffs from notebooks are really weird. We might want to use nbdev for reviewing in the future

@jonashaag
Copy link
Collaborator Author

Yeah it’s a mess. There are also some stripping tools to remove stuff like “Out [42]” that may frequently change

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants