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

[SGX] Use Fortanix EDP #2885

Closed
wants to merge 19 commits into from
Closed

[SGX] Use Fortanix EDP #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
95be849
Remove SGX in preparation for adding SGX
nhynes Mar 24, 2019
43ac98d
Remove SGX from Rust
nhynes Mar 24, 2019
4959522
Use Fortanix SGX
nhynes Mar 24, 2019
20074e9
Update demo
nhynes Mar 25, 2019
77cbf4b
Rebase onto master
nhynes May 16, 2019
9b163a1
Update Cargo.tomls
nhynes Jul 29, 2019
03378e6
Update SGX
nhynes Jul 29, 2019
5a89c1b
Fix lint
nhynes Jul 29, 2019
4e61851
Fix rustfmt
nhynes Jul 29, 2019
e28700b
Put back feature flags
nhynes Jul 29, 2019
08bf7e5
Update macros crate
nhynes Sep 22, 2019
134c1a9
Update crates
nhynes Sep 23, 2019
b5ec2f1
Remove dependency on backtrace-rs
nhynes Sep 23, 2019
521bfc4
Fix SGX build script
nhynes Sep 23, 2019
dc37e96
Update sgx demo
nhynes Sep 23, 2019
becf735
Allow cargo.lock
nhynes Sep 23, 2019
ede463a
Merge branch 'master' into sgx-new
nhynes Oct 10, 2019
a3c7f9c
Fix frontend compilation
nhynes Sep 23, 2019
827fbcd
Re-enable Rust CI
nhynes Oct 12, 2019
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
7 changes: 0 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ tvm_option(USE_STACKVM_RUNTIME "Include stackvm into the runtime" OFF)
tvm_option(USE_GRAPH_RUNTIME "Build with tiny graph runtime" ON)
tvm_option(USE_GRAPH_RUNTIME_DEBUG "Build with tiny graph runtime debug mode" OFF)
tvm_option(USE_RELAY_DEBUG "Building Relay in debug mode..." OFF)
tvm_option(USE_SGX "Build with SGX" OFF)
tvm_option(USE_RTTI "Build with RTTI" ON)
tvm_option(USE_MSVC_MT "Build with MT" OFF)
tvm_option(USE_MICRO "Build with Micro" OFF)
Expand Down Expand Up @@ -236,7 +235,6 @@ include(cmake/modules/OpenGL.cmake)
include(cmake/modules/Vulkan.cmake)
include(cmake/modules/Metal.cmake)
include(cmake/modules/ROCM.cmake)
include(cmake/modules/SGX.cmake)
include(cmake/modules/LLVM.cmake)
include(cmake/modules/Micro.cmake)
include(cmake/modules/ANTLR.cmake)
Expand Down Expand Up @@ -271,11 +269,6 @@ else()
set_target_properties(tvm PROPERTIES COMPILE_DEFINITIONS "NDEBUG")
endif(USE_RELAY_DEBUG)

if(NOT USE_SGX STREQUAL "OFF")
add_dependencies(tvm sgx_edl)
add_dependencies(tvm_runtime sgx_edl tvm_t)
install(TARGETS tvm_t ARCHIVE DESTINATION lib${LIB_SUFFIX})
endif()
add_library(nnvm_compiler SHARED ${NNVM_COMPILER_SRCS})

if(USE_THREADS)
Expand Down
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ stage('Build') {
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_unittest.sh"
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_integration.sh"
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta.sh"
sh "${docker_run} ${ci_cpu} ./tests/scripts/task_rust.sh"
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions apps/sgx/.cargo/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[build]
target = "x86_64-fortanix-unknown-sgx"

[target.x86_64-fortanix-unknown-sgx]
runner = "ftxsgx-runner-cargo"
1 change: 0 additions & 1 deletion apps/sgx/.gitignore
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions apps/sgx/.rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../rust/.rustfmt.toml
Loading