Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding option to export per-sample JSON in FiftyOneDataset format #2028

Merged
merged 26 commits into from
Aug 30, 2022
Merged

Adding option to export per-sample JSON in FiftyOneDataset format #2028

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
921dff7
bumps, release notes
benjaminpkane Aug 19, 2022
628f012
add to release notes
benjaminpkane Aug 19, 2022
6363b62
linting
benjaminpkane Aug 19, 2022
ad9c90f
Merge branch 'develop' into release/v0.16.6
brimoor Aug 24, 2022
3d9d59a
updating pkg versions
brimoor Aug 24, 2022
87aefe1
removing unnecessary pull
brimoor Aug 24, 2022
07a7941
Merge branch 'develop' into release/v0.16.6
brimoor Aug 24, 2022
4e4a30b
move App build to end
brimoor Aug 25, 2022
ae022c3
updating release notes
brimoor Aug 25, 2022
38a9204
always migrate when user is admin
brimoor Aug 25, 2022
f8efbaa
moving legacy troubleshooting to another page
brimoor Aug 25, 2022
6bedc9c
adding docs on coordinating migrations
brimoor Aug 25, 2022
ef536b1
adding helpful error when a dataset fails to load
brimoor Aug 25, 2022
5eb1cf3
initial work
brimoor Aug 25, 2022
ff8760a
pinning max requirement
brimoor Aug 25, 2022
f5f671b
using more cloud-friendly layout
brimoor Aug 25, 2022
c6b5387
adding upgrade note
brimoor Aug 25, 2022
d648803
Merge branch 'release/v0.16.6' into feature/fiftyone-dataset-update
brimoor Aug 25, 2022
aa40130
adding support for rendering progress bars in DynamicBatcher
brimoor Aug 26, 2022
dae6ce6
using DynamicBatcher's progress feature
brimoor Aug 26, 2022
613007f
adding support for importing/exporting directories of docs
brimoor Aug 26, 2022
9e58330
reduce max limit
brimoor Aug 26, 2022
7e4829f
adding support for importing/exporting per-frame directories in Fifty…
brimoor Aug 26, 2022
44b4f9c
adding use_dirs unit test
brimoor Aug 26, 2022
8b98239
documenting use_dirs option
brimoor Aug 26, 2022
04109aa
Merge branch 'develop' into feature/fiftyone-dataset-update
brimoor Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move App build to end
  • Loading branch information
@brimoor
brimoor committed Aug 25, 2022
commit 4e4a30b762313d095b706d7125af8bd2396ccb62
45 changes: 23 additions & 22 deletions install.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,28 +93,6 @@ else
pip install fiftyone-db
fi

if [ ${BUILD_APP} = true ]; then
echo "***** INSTALLING FIFTYONE-APP *****"
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
nvm install ${NODE_VERSION}
nvm use ${NODE_VERSION}
npm -g install yarn
if [ -f ~/.bashrc ]; then
source ~/.bashrc
elif [ -f ~/.bash_profile ]; then
source ~/.bash_profile
else
echo "WARNING: unable to locate a bash profile to 'source'; you may need to start a new shell"
fi
cd app
echo "Building the App. This will take a minute or two..."
yarn install > /dev/null 2>&1
yarn build
cd ..
fi

if [ ${VOXEL51_INSTALL} = false ]; then
echo "***** INSTALLING FIFTYONE-BRAIN *****"
pip install fiftyone-brain
Expand Down Expand Up @@ -150,4 +128,27 @@ if [ ${SOURCE_ETA_INSTALL} = true ]; then
cd ..
fi

# Do this last since `source` can exit Python virtual environments
if [ ${BUILD_APP} = true ]; then
echo "***** INSTALLING FIFTYONE-APP *****"
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
nvm install ${NODE_VERSION}
nvm use ${NODE_VERSION}
npm -g install yarn
if [ -f ~/.bashrc ]; then
source ~/.bashrc
elif [ -f ~/.bash_profile ]; then
source ~/.bash_profile
else
echo "WARNING: unable to locate a bash profile to 'source'; you may need to start a new shell"
fi
cd app
echo "Building the App. This will take a minute or two..."
yarn install > /dev/null 2>&1
yarn build
cd ..
fi

echo "***** INSTALLATION COMPLETE *****"