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

Use maven based submission by default for samples #603

Merged
merged 3 commits into from
Aug 25, 2022
Merged

Use maven based submission by default for samples #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51b8924
use maven based submission by default
xiaoyongzhu Aug 24, 2022
fdfc374
Update Customer360.ipynb
xiaoyongzhu Aug 24, 2022
29f2196
Update product_recommendation_demo_advanced.ipynb
xiaoyongzhu Aug 24, 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
1,046 changes: 1,045 additions & 1 deletion docs/samples/customer360/Customer360.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions docs/samples/databricks/databricks_quickstart_nyc_taxi_driver.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,12 @@
"cluster_id = ctx.tags().get(\"clusterId\").get()\n",
"\n",
"\n",
"feathr_runtime_location = \"https://azurefeathrstorage.blob.core.windows.net/public/feathr-assembly-LATEST.jar\"\n",
"\n",
"# databricks_config = {'run_name':'FEATHR_FILL_IN','existing_cluster_id':cluster_id,'libraries':[{'jar':'FEATHR_FILL_IN'}],'spark_jar_task':{'main_class_name':'FEATHR_FILL_IN','parameters':['FEATHR_FILL_IN']}}\n",
"os.environ['spark_config__databricks__workspace_instance_url'] = \"https://\" + host_name\n",
"os.environ['spark_config__databricks__config_template']='{\"run_name\":\"FEATHR_FILL_IN\",\"new_cluster\":{\"spark_version\":\"10.4.x-scala2.12\",\"node_type_id\":\"Standard_D3_v2\",\"num_workers\":2,\"spark_conf\":{\"FEATHR_FILL_IN\":\"FEATHR_FILL_IN\"}},\"libraries\":[{\"jar\":\"FEATHR_FILL_IN\"}],\"spark_jar_task\":{\"main_class_name\":\"FEATHR_FILL_IN\",\"parameters\":[\"FEATHR_FILL_IN\"]}}'\n",
"# os.environ['spark_config__databricks__config_template']=json.dumps(databricks_config)\n",
"os.environ['spark_config__databricks__work_dir']='dbfs:/feathr_getting_started'\n",
"os.environ['spark_config__databricks__feathr_runtime_location']=feathr_runtime_location\n",
"os.environ['project_config__project_name']='feathr_getting_started'\n",
"os.environ['DATABRICKS_WORKSPACE_TOKEN_VALUE'] = host_token"
]
Expand Down Expand Up @@ -1446,4 +1444,4 @@
},
"nbformat": 4,
"nbformat_minor": 0
}
}
2 changes: 0 additions & 2 deletions docs/samples/fraud_detection_demo.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,10 @@
" workspace_dir: 'abfss://feathrazuretest3fs@feathrazuretest3storage.dfs.core.windows.net/fraud_detection_test'\n",
" executor_size: 'Small'\n",
" executor_num: 4\n",
" feathr_runtime_location: wasbs://public@azurefeathrstorage.blob.core.windows.net/feathr-assembly-LATEST.jar\n",
" databricks:\n",
" workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net'\n",
" config_template: {'run_name':'','new_cluster':{'spark_version':'9.1.x-scala2.12','node_type_id':'Standard_D3_v2','num_workers':2,'spark_conf':{}},'libraries':[{'jar':''}],'spark_jar_task':{'main_class_name':'','parameters':['']}}\n",
" work_dir: 'dbfs:/fraud_detection_test'\n",
" feathr_runtime_location: https://azurefeathrstorage.blob.core.windows.net/public/feathr-assembly-LATEST.jar\n",
"online_store:\n",
" redis:\n",
" host: 'feathrazuretest3redis.redis.cache.windows.net'\n",
Expand Down
2 changes: 0 additions & 2 deletions docs/samples/product_recommendation_demo.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,10 @@
" workspace_dir: 'abfss://feathrazuretest3fs@feathrazuretest3storage.dfs.core.windows.net/feathr_getting_started'\n",
" executor_size: 'Small'\n",
" executor_num: 4\n",
" feathr_runtime_location: wasbs://public@azurefeathrstorage.blob.core.windows.net/feathr-assembly-LATEST.jar\n",
" databricks:\n",
" workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net'\n",
" config_template: {'run_name':'','new_cluster':{'spark_version':'9.1.x-scala2.12','node_type_id':'Standard_D3_v2','num_workers':2,'spark_conf':{}},'libraries':[{'jar':''}],'spark_jar_task':{'main_class_name':'','parameters':['']}}\n",
" work_dir: 'dbfs:/feathr_getting_started'\n",
" feathr_runtime_location: https://azurefeathrstorage.blob.core.windows.net/public/feathr-assembly-LATEST.jar\n",
"online_store:\n",
" redis:\n",
" host: 'feathrazuretest3redis.redis.cache.windows.net'\n",
Expand Down
1,407 changes: 1,406 additions & 1 deletion docs/samples/product_recommendation_demo_advanced.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion feathr_project/feathr/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
TYPEDEF_ARRAY_DERIVED_FEATURE=f"array<feathr_derived_feature_{REGISTRY_TYPEDEF_VERSION}>"
TYPEDEF_ARRAY_ANCHOR_FEATURE=f"array<feathr_anchor_feature_{REGISTRY_TYPEDEF_VERSION}>"

FEATHR_MAVEN_ARTIFACT="com.linkedin.feathr:feathr_2.12:0.6.0"
FEATHR_MAVEN_ARTIFACT="com.linkedin.feathr:feathr_2.12:0.6.2"
14 changes: 7 additions & 7 deletions feathr_project/feathrcli/data/feathr_user_workspace/nyc_driver_demo.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,10 @@
" workspace_dir: 'abfss://feathrazuretest3fs@feathrazuretest3storage.dfs.core.windows.net/feathr_getting_started'\n",
" executor_size: 'Small'\n",
" executor_num: 4\n",
" feathr_runtime_location: wasbs://public@azurefeathrstorage.blob.core.windows.net/feathr-assembly-LATEST.jar\n",
" databricks:\n",
" workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net'\n",
" config_template: {'run_name':'','new_cluster':{'spark_version':'9.1.x-scala2.12','node_type_id':'Standard_D3_v2','num_workers':2,'spark_conf':{}},'libraries':[{'jar':''}],'spark_jar_task':{'main_class_name':'','parameters':['']}}\n",
" work_dir: 'dbfs:/feathr_getting_started'\n",
" feathr_runtime_location: https://azurefeathrstorage.blob.core.windows.net/public/feathr-assembly-LATEST.jar\n",
"online_store:\n",
" redis:\n",
" host: 'feathrazuretest3redis.redis.cache.windows.net'\n",
Expand Down Expand Up @@ -694,11 +692,8 @@
}
],
"metadata": {
"interpreter": {
"hash": "b3c5d8fd79e029a19bf620c04a250a0cafa2291ba3ed87972a3e2a099b099985"
},
"kernelspec": {
"display_name": "Python 3.9.12 ('product_env': venv)",
"display_name": "Python 3.9.5 ('base')",
"language": "python",
"name": "python3"
},
Expand All @@ -712,7 +707,12 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.12"
"version": "3.9.5"
},
"vscode": {
"interpreter": {
"hash": "3d597f4c481aa0f25dceb95d2a0067e73c0966dcbd003d741d821a7208527ecf"
}
}
},
"nbformat": 4,
Expand Down