Skip to content

Commit 7544aa8

Browse files
cccclaifacebook-github-bot
authored andcommitted
use flatc from conda instead of build from source (#429)
Summary: Pull Request resolved: #429 Differential Revision: D49487908 fbshipit-source-id: ddc5f8839bda8f1e9353f8380f25ae5df7f4c4ad
1 parent a237895 commit 7544aa8

File tree

5 files changed

+9
-19
lines changed

5 files changed

+9
-19
lines changed

.github/workflows/pull.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
with:
104104
runner: linux.2xlarge
105105
docker-image: executorch-ubuntu-22.04-clang12
106-
submodules: 'true'
106+
submodules: 'false'
107107
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
108108
script: |
109109
# The generic Linux job chooses to use base env, not the one setup by the image
@@ -126,7 +126,7 @@ jobs:
126126
fail-fast: false
127127
with:
128128
runner: macos-m1-12
129-
submodules: 'true'
129+
submodules: 'false'
130130
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
131131
script: |
132132
WORKSPACE=$(pwd)

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ include(${EXECUTORCH_SRCS_FILE})
131131

132132
if(NOT FLATC_EXECUTABLE)
133133
set(FLATC_EXECUTABLE flatc)
134-
option(FLATBUFFERS_BUILD_FLATC "" ON)
134+
option(FLATBUFFERS_BUILD_FLATC "" OFF)
135135
option(FLATBUFFERS_BUILD_FLATHASH "" OFF)
136136
option(FLATBUFFERS_BUILD_FLATLIB "" OFF)
137137
option(FLATBUFFERS_BUILD_TESTS "" OFF)

schema/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ add_custom_command(
4141
-o "${_program_schema__include_dir}/executorch/schema"
4242
${_program_schema__srcs}
4343
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
44-
DEPENDS ${FLATC_EXECUTABLE} ${_program_schema__srcs}
44+
DEPENDS ${_program_schema__srcs}
4545
COMMENT "Generating program_schema headers"
4646
VERBATIM)
4747

third-party/TARGETS

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,35 +169,23 @@ runtime.cxx_binary(
169169
"flatbuffers/grpc/src/compiler/python_generator.cc",
170170
"flatbuffers/grpc/src/compiler/swift_generator.cc",
171171
"flatbuffers/grpc/src/compiler/ts_generator.cc",
172-
"flatbuffers/src/annotated_binary_text_gen.cpp",
173-
"flatbuffers/src/bfbs_gen_lua.cpp",
174-
"flatbuffers/src/bfbs_gen_nim.cpp",
175-
"flatbuffers/src/binary_annotator.cpp",
176-
"flatbuffers/src/code_generators.cpp",
177-
"flatbuffers/src/file_binary_writer.cpp",
178-
"flatbuffers/src/file_name_saving_file_manager.cpp",
179-
"flatbuffers/src/file_writer.cpp",
180-
"flatbuffers/src/flatc.cpp",
181172
"flatbuffers/src/flatc_main.cpp",
182-
"flatbuffers/src/idl_gen_binary.cpp",
183173
"flatbuffers/src/idl_gen_cpp.cpp",
184174
"flatbuffers/src/idl_gen_csharp.cpp",
185175
"flatbuffers/src/idl_gen_dart.cpp",
186-
"flatbuffers/src/idl_gen_fbs.cpp",
187176
"flatbuffers/src/idl_gen_go.cpp",
188177
"flatbuffers/src/idl_gen_grpc.cpp",
189178
"flatbuffers/src/idl_gen_java.cpp",
179+
"flatbuffers/src/idl_gen_js_ts.cpp",
190180
"flatbuffers/src/idl_gen_json_schema.cpp",
191181
"flatbuffers/src/idl_gen_kotlin.cpp",
192182
"flatbuffers/src/idl_gen_lobster.cpp",
183+
"flatbuffers/src/idl_gen_lua.cpp",
193184
"flatbuffers/src/idl_gen_php.cpp",
194185
"flatbuffers/src/idl_gen_python.cpp",
195186
"flatbuffers/src/idl_gen_rust.cpp",
196187
"flatbuffers/src/idl_gen_swift.cpp",
197188
"flatbuffers/src/idl_gen_text.cpp",
198-
"flatbuffers/src/idl_gen_ts.cpp",
199-
"flatbuffers/src/idl_parser.cpp",
200-
"flatbuffers/src/reflection.cpp",
201189
"flatbuffers/src/util.cpp",
202190
],
203191
include_directories = [
@@ -209,6 +197,7 @@ runtime.cxx_binary(
209197
"flatbuffers/grpc/src/compiler/go_generator.h",
210198
"flatbuffers/grpc/src/compiler/java_generator.h",
211199
"flatbuffers/grpc/src/compiler/python_generator.h",
200+
"flatbuffers/grpc/src/compiler/python_private_generator.h",
212201
"flatbuffers/grpc/src/compiler/schema_interface.h",
213202
"flatbuffers/grpc/src/compiler/swift_generator.h",
214203
"flatbuffers/grpc/src/compiler/ts_generator.h",
@@ -219,6 +208,7 @@ runtime.cxx_binary(
219208
_is_external_target = True,
220209
)
221210

211+
222212
runtime.genrule(
223213
name = "libtorch_gen",
224214
outs = select({

third-party/flatbuffers

Submodule flatbuffers updated 1636 files

0 commit comments

Comments
 (0)