Skip to content

Commit

Permalink
Merge pull request #5677 from dthkao/explicit_relativity
Browse files Browse the repository at this point in the history
Use explicit relative import syntax for python 3 compatibility in audioset.
  • Loading branch information
plakal committed Nov 4, 2018
2 parents 424fe9f + f54d201 commit 3a6c5f1
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions research/audioset/vggish_inference_demo.py
Expand Up @@ -46,16 +46,16 @@

from __future__ import print_function

from . import vggish_input
from . import vggish_params
from . import vggish_postprocess
from . import vggish_slim

import numpy as np
from scipy.io import wavfile
import six
import tensorflow as tf

import vggish_input
import vggish_params
import vggish_postprocess
import vggish_slim

flags = tf.app.flags

flags.DEFINE_string(
Expand Down
6 changes: 3 additions & 3 deletions research/audioset/vggish_input.py
Expand Up @@ -15,13 +15,13 @@

"""Compute input examples for VGGish from audio waveform."""

from . import mel_features
from . import vggish_params

import numpy as np
import resampy
from scipy.io import wavfile

import mel_features
import vggish_params


def waveform_to_examples(data, sample_rate):
"""Converts audio waveform into an array of examples for VGGish.
Expand Down
4 changes: 2 additions & 2 deletions research/audioset/vggish_postprocess.py
Expand Up @@ -15,9 +15,9 @@

"""Post-process embeddings from VGGish."""

import numpy as np
from . import vggish_params

import vggish_params
import numpy as np


class Postprocessor(object):
Expand Down
2 changes: 1 addition & 1 deletion research/audioset/vggish_slim.py
Expand Up @@ -30,8 +30,8 @@
https://github.com/tensorflow/models/blob/master/research/slim/nets/vgg.py
"""

from . import vggish_params as params
import tensorflow as tf
import vggish_params as params

slim = tf.contrib.slim

Expand Down
10 changes: 5 additions & 5 deletions research/audioset/vggish_smoke_test.py
Expand Up @@ -31,14 +31,14 @@

from __future__ import print_function

from . import vggish_input
from . import vggish_params
from . import vggish_postprocess
from . import vggish_slim

import numpy as np
import tensorflow as tf

import vggish_input
import vggish_params
import vggish_postprocess
import vggish_slim

print('\nTesting your install of VGGish\n')

# Paths to downloaded VGGish files.
Expand Down
8 changes: 4 additions & 4 deletions research/audioset/vggish_train_demo.py
Expand Up @@ -47,13 +47,13 @@

from random import shuffle

from . import vggish_input
from . import vggish_params
from . import vggish_slim

import numpy as np
import tensorflow as tf

import vggish_input
import vggish_params
import vggish_slim

flags = tf.app.flags
slim = tf.contrib.slim

Expand Down

0 comments on commit 3a6c5f1

Please sign in to comment.