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

Jump to bottom

Update s3 related links in readme and documents #2489

Merged
merged 10 commits into from
Jun 28, 2020
Merged

Update s3 related links in readme and documents #2489

merged 10 commits into from
Jun 28, 2020

Conversation

pinggao18
Copy link
Contributor

No description provided.

@glorysdj
Copy link
Contributor

please also search s3 usage in readmes.

@qiyuangong
Copy link
Contributor

Pls resolve conflict with master.

qiyuangong
qiyuangong reviewed Jun 24, 2020
View reviewed changes
scripts/data/NAB/nyc_taxi/get_nyc_taxi.sh Outdated
@@ -1,45 +0,0 @@
#!/usr/bin/env bash
Copy link
Contributor

Choose a reason for hiding this comment

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

Delete this file to resolve conflict is not a good idea. Because if this PR is merged into master, then this file will also be deleted. Pls rebase with current master. Then push to your own branch with --force.

@qiyuangong
Copy link
Contributor

Well, things are going wrong. Too much file changes. :(

Rebase won't create commit in normal status. Use git reflog to recover to previous status. Then, rebase again.

@qiyuangong
Copy link
Contributor 

git reset --hard 9550255
git rebase upstream/master
# Resolve conflict

@qiyuangong qiyuangong requested a review from glorysdj June 24, 2020 05:21
qiyuangong
qiyuangong reviewed Jun 24, 2020
View reviewed changes
scripts/data/NAB/nyc_taxi/get_nyc_taxi.sh
@@ -41,5 +41,4 @@ fi
echo "Downloading nyc_taxi.csv"
wget http://10.239.45.10:8081/repository/raw/analytics-zoo-data/data/NAB/nyc_taxi/nyc_taxi.csv
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to sync with @glorysdj about this file.

qiyuangong
qiyuangong approved these changes Jun 24, 2020
View reviewed changes
Copy link
Contributor

@qiyuangong qiyuangong left a comment

Choose a reason for hiding this comment

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

LGTM

@pinggao18
Copy link
Contributor Author

jenkins test: http://10.239.47.210:18888/view/ZOO-PR/job/ZOO-PR-Validation/3653/

@glorysdj glorysdj merged commit e95dcd6 into intel-analytics:master Jun 28, 2020
dding3 pushed a commit to dding3/analytics-zoo that referenced this pull request Jul 27, 2021
@pinggao18
Update s3 related links in readme and documents (intel-analytics#2489)
fd6a2d8 
* Update s3 related links in readme  and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* update

* update

* modify line length limit

* update
dding3 pushed a commit to dding3/analytics-zoo that referenced this pull request Aug 9, 2021
@pinggao18
Update s3 related links in readme and documents (intel-analytics#2489)
0ad32e9 
* Update s3 related links in readme  and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* update

* update

* modify line length limit

* update
Le-Zheng pushed a commit to Le-Zheng/analytics-zoo that referenced this pull request Oct 13, 2021
@pinggao18
Update s3 related links in readme and documents (intel-analytics#2489)
9dc4c92 
* Update s3 related links in readme  and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* update

* update

* modify line length limit

* update
glorysdj added a commit that referenced this pull request Oct 14, 2021
@glorysdj @Le-Zheng
@pinggao18 @pinggao187 @hkvision @GavinGu07 @fanzhuyifan @Litchilitchy @ardaci @yangw1234 @zzti-bsj @Adria777
Migrate hyperzoo (#4958)
7d33fd8 
* add hyperzoo for k8s support (#2140)

* add hyperzoo for k8s support

* format

* format

* format

* format

* run examples on k8s readme (#2163)

* k8s  readme

* fix jdk download issue (#2219)

* add doc for submit jupyter notebook and cluster serving to k8s (#2221)

* add hyperzoo doc

* add hyperzoo doc

* add hyperzoo doc

* add hyperzoo doc

* fix jdk download issue (#2223)

* bump to 0.9s (#2227)

* update jdk download url (#2259)

* update some previous docs (#2284)

* K8docsupdate (#2306)

* Update README.md

* Update s3 related links in readme  and documents (#2489)

* Update s3 related links in readme  and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* Update s3 related links in readme and documents

* update

* update

* modify line length limit

* update

* Update mxnet-mkl version in hyper-zoo dockerfile (#2720)

Co-authored-by: gaoping <[email protected]>

* update bigdl version (#2743)

* update bigdl version

* hyperzoo dockerfile add cluster-serving (#2731)

* hyperzoo dockerfile add cluster-serving

* update

* update

* update

* update jdk url

* update jdk url

* update

Co-authored-by: gaoping <[email protected]>

* Support init_spark_on_k8s (#2813)

* initial

* fix

* code refactor

* bug fix

* update docker

* style

* add conda to docker image (#2894)

* add conda to docker image

* Update Dockerfile

* Update Dockerfile

Co-authored-by: glorysdj <[email protected]>

* Fix code blocks indents in .md files (#2978)

* Fix code blocks indents in .md files

Previously a lot of the code blocks in markdown files were horribly indented with bad white spaces in the beginning of lines. Users can't just select, copy, paste, and run (in the case of python). I have fixed all these, so there is no longer any code block with bad white space at the beginning of the lines.
It would be nice if you could try to make sure in future commits that all code blocks are properly indented inside and have the right amount of white space in the beginning!

* Fix small style issue

* Fix indents

* Fix indent and add \ for multiline commands

Change indent from 3 spaces to 4, and add "\" for multiline bash commands

Co-authored-by: Yifan Zhu <[email protected]>

* enable bigdl 0.12 (#3101)

* switch to bigdl 0.12

* Hyperzoo example ref (#3143)

* specify pip version to fix oserror 0 of proxy (#3165)

* Bigdl0.12.1 (#3155)

* bigdl 0.12.1

* bump 0.10.0-Snapshot (#3237)

* update runtime image name (#3250)

* update jdk download url (#3316)

* update jdk8 url (#3411)

Co-authored-by: ardaci <[email protected]>

* update hyperzoo docker image (#3429)

* update hyperzoo image (#3457)

* fix jdk in az docker (#3478)

* fix jdk in az docker

* fix jdk for hyperzoo

* fix jdk in jenkins docker

* fix jdk in cluster serving docker

* fix jdk

* fix readme

* update python dep to fit cnvrg (#3486)

* update ray version doc (#3568)

* fix deploy hyperzoo issue (#3574)

Co-authored-by: gaoping <[email protected]>

* add spark fix and net-tools and status check (#3742)

* intsall netstat and add check status

* add spark fix for graphene

* bigdl 0.12.2 (#3780)

* bump to 0.11-S and fix version issues except ipynb

* add multi-stage build Dockerfile (#3916)

* add multi-stage build Dockerfile

* multi-stage build dockerfile

* multi-stage build dockerfile

* Rename Dockerfile.multi to Dockerfile

* delete Dockerfile.multi

* remove comments, add TINI_VERSION to common arg, remove Dockerfile.multi

* multi-stage add tf_slim

Co-authored-by: shaojie <[email protected]>

* update hyperzoo doc and k8s doc (#3959)

* update userguide of k8s

* update k8s guide

* update hyperzoo doc

* Update k8s.md

add note

* Update k8s.md

add note

* Update k8s.md

update notes

* fix 4087 issue (#4097)

Co-authored-by: shaojie <[email protected]>

* fixed 4086 and 4083 issues (#4098)

Co-authored-by: shaojie <[email protected]>

* Reduce image size (#4132)

* Reduce Dockerfile size
1. del redis stage
2. del flink stage
3. del conda & exclude some python packages
4. add copies layer stage

* update numpy version to 1.18.1

Co-authored-by: zzti-bsj <[email protected]>

* update hyperzoo image (#4250)

Co-authored-by: Adria777 <[email protected]>

* bigdl 0.13 (#4210)

* bigdl 0.13

* update

* print exception

* pyspark2.4.6

* update release PyPI script

* update

* flip snapshot-0.12.0 and spark2.4.6 (#4254)

* s-0.12.0 master

* Update __init__.py

* Update python.md

* fix docker issues due to version update (#4280)

* fix docker issues

* fix docker issues

* update Dockerfile to support spark 3.1.2 && 2.4.6 (#4436)

Co-authored-by: shaojie <[email protected]>

* update hyperzoo, add lib for tf2 (#4614)

* delete tf 1.15.0 (#4719)

Co-authored-by: Le-Zheng <[email protected]>
Co-authored-by: pinggao18 <[email protected]>
Co-authored-by: pinggao187 <[email protected]>
Co-authored-by: gaoping <[email protected]>
Co-authored-by: Kai Huang <[email protected]>
Co-authored-by: GavinGu07 <[email protected]>
Co-authored-by: Yifan Zhu <[email protected]>
Co-authored-by: Yifan Zhu <[email protected]>
Co-authored-by: Song Jiaming <[email protected]>
Co-authored-by: ardaci <[email protected]>
Co-authored-by: Yang Wang <[email protected]>
Co-authored-by: zzti-bsj <[email protected]>
Co-authored-by: shaojie <[email protected]>
Co-authored-by: Lingqi Su <[email protected]>
Co-authored-by: Adria777 <[email protected]>
Co-authored-by: shaojie <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qiyuangong qiyuangong qiyuangong approved these changes

@glorysdj glorysdj Awaiting requested review from glorysdj

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pinggao18 @glorysdj @qiyuangong @pinggao187