Skip to content
New issue

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

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

Already on GitHub? # to your account

Release 0.67.0 #154

Merged
merged 3 commits into from
Aug 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changelog
All notable changes to this project will be documented in this file.

## [Unreleased]
## [0.67.0] - 2019-08-28
### Added
- Add an `alternatives` attribute, containing less likely alternatives, to ([#153](https://github.com/snipsco/snips-nlu-ontology/pull/153)):
- `IntentParserResult`
Expand Down Expand Up @@ -201,7 +201,7 @@ All notable changes to this project will be documented in this file.
### Changed
- Updated Rustling ontology to `0.16.4`

[Unreleased]: https://github.com/snipsco/snips-nlu-ontology/compare/0.66.0...HEAD
[0.67.0]: https://github.com/snipsco/snips-nlu-ontology/compare/0.66.0...0.67.0
[0.66.0]: https://github.com/snipsco/snips-nlu-ontology/compare/0.65.0...0.66.0
[0.65.0]: https://github.com/snipsco/snips-nlu-ontology/compare/0.64.8...0.65.0
[0.64.8]: https://github.com/snipsco/snips-nlu-ontology/compare/0.64.7...0.64.8
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "snips-nlu-ontology"
version = "0.67.0-SNAPSHOT"
version = "0.67.0"
authors = [
"Adrien Ball <adrien.ball@snips.ai>",
"Thibaut Lorrain <thibaut.lorrain@snips.ai>",
Expand Down
2 changes: 1 addition & 1 deletion doc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "snips-nlu-ontology-doc"
version = "0.67.0-SNAPSHOT"
version = "0.67.0"
authors = ["Adrien Ball <adrien.ball@snips.ai>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion ffi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "snips-nlu-ontology-ffi"
version = "0.67.0-SNAPSHOT"
version = "0.67.0"
authors = ["Kevin Lefevre <kevin.lefevre@snips.ai>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion ffi/ffi-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "snips-nlu-ontology-ffi-macros"
version = "0.67.0-SNAPSHOT"
version = "0.67.0"
authors = [
"Kevin Lefevre <kevin.lefevre@snips.ai>",
"Thibaut Lorrain <thibaut.lorrain@snips.ai>",
Expand Down
18 changes: 9 additions & 9 deletions ffi/ffi-macros/src/builtin_entity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ pub struct CBuiltinEntity {
pub entity: CSlotValue,
pub entity_kind: *const libc::c_char,
pub value: *const libc::c_char,
pub range_start: libc::int32_t,
pub range_end: libc::int32_t,
pub range_start: i32,
pub range_end: i32,
}

impl From<BuiltinEntity> for CBuiltinEntity {
Expand All @@ -30,8 +30,8 @@ impl From<BuiltinEntity> for CBuiltinEntity {
entity: CSlotValue::from(e.entity),
entity_kind: CString::new(e.entity_kind.identifier()).unwrap().into_raw(),
value: CString::new(e.value).unwrap().into_raw(),
range_start: e.range.start as libc::int32_t,
range_end: e.range.end as libc::int32_t,
range_start: e.range.start as i32,
range_end: e.range.end as i32,
}
}
}
Expand All @@ -47,13 +47,13 @@ impl Drop for CBuiltinEntity {
#[derive(Debug)]
pub struct CBuiltinEntityArray {
pub data: *const CBuiltinEntity,
pub size: libc::int32_t, // Note: we can't use `libc::size_t` because it's not supported by JNA
pub size: i32, // Note: we can't use `libc::size_t` because it's not supported by JNA
}

impl From<Vec<CBuiltinEntity>> for CBuiltinEntityArray {
fn from(input: Vec<CBuiltinEntity>) -> Self {
Self {
size: input.len() as libc::int32_t,
size: input.len() as i32,
data: Box::into_raw(input.into_boxed_slice()) as *const CBuiltinEntity,
}
}
Expand Down Expand Up @@ -93,7 +93,7 @@ pub fn all_builtin_entities() -> CStringArray {

CStringArray {
data: ALL.0.as_ptr() as *const *const libc::c_char,
size: ALL.0.len() as libc::int32_t,
size: ALL.0.len() as i32,
}
}

Expand All @@ -113,7 +113,7 @@ pub fn all_grammar_entities() -> CStringArray {

CStringArray {
data: ALL.0.as_ptr() as *const *const libc::c_char,
size: ALL.0.len() as libc::int32_t,
size: ALL.0.len() as i32,
}
}

Expand All @@ -133,7 +133,7 @@ pub fn all_gazetteer_entities() -> CStringArray {

CStringArray {
data: ALL.0.as_ptr() as *const *const libc::c_char,
size: ALL.0.len() as libc::int32_t,
size: ALL.0.len() as i32,
}
}

Expand Down
2 changes: 1 addition & 1 deletion ffi/ffi-macros/src/language.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ pub fn supported_languages() -> CStringArray {

CStringArray {
data: ALL.0.as_ptr() as *const *const libc::c_char,
size: ALL.0.len() as libc::int32_t,
size: ALL.0.len() as i32,
}
}
74 changes: 37 additions & 37 deletions ffi/ffi-macros/src/ontology.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ impl AsRust<IntentParserResult> for CIntentParserResult {
impl Drop for CIntentParserResult {
fn drop(&mut self) {
take_back_c_string!(self.input);
unsafe { CIntentClassifierResult::drop_raw_pointer(self.intent) };
unsafe { CSlotList::drop_raw_pointer(self.slots) };
unsafe { CIntentParserAlternativeArray::drop_raw_pointer(self.alternatives) };
let _ = unsafe { CIntentClassifierResult::drop_raw_pointer(self.intent) };
let _ = unsafe { CSlotList::drop_raw_pointer(self.slots) };
let _ = unsafe { CIntentParserAlternativeArray::drop_raw_pointer(self.alternatives) };
}
}

Expand Down Expand Up @@ -87,8 +87,8 @@ impl AsRust<IntentParserAlternative> for CIntentParserAlternative {

impl Drop for CIntentParserAlternative {
fn drop(&mut self) {
unsafe { CIntentClassifierResult::drop_raw_pointer(self.intent) };
unsafe { CSlotList::drop_raw_pointer(self.slots) };
let _ = unsafe { CIntentClassifierResult::drop_raw_pointer(self.intent) };
let _ = unsafe { CSlotList::drop_raw_pointer(self.slots) };
}
}

Expand All @@ -99,13 +99,13 @@ pub struct CIntentParserAlternativeArray {
/// Pointer to the first result of the list
pub intent_parser_alternatives: *const CIntentParserAlternative,
/// Number of results in the list
pub size: libc::int32_t,
pub size: i32,
}

impl From<Vec<IntentParserAlternative>> for CIntentParserAlternativeArray {
fn from(input: Vec<IntentParserAlternative>) -> Self {
Self {
size: input.len() as libc::int32_t,
size: input.len() as i32,
intent_parser_alternatives: Box::into_raw(
input
.into_iter()
Expand Down Expand Up @@ -190,13 +190,13 @@ pub struct CIntentClassifierResultArray {
/// Pointer to the first result of the list
pub intent_classifier_results: *const CIntentClassifierResult,
/// Number of results in the list
pub size: libc::int32_t,
pub size: i32,
}

impl From<Vec<IntentClassifierResult>> for CIntentClassifierResultArray {
fn from(input: Vec<IntentClassifierResult>) -> Self {
Self {
size: input.len() as libc::int32_t,
size: input.len() as i32,
intent_classifier_results: Box::into_raw(
input
.into_iter()
Expand Down Expand Up @@ -243,13 +243,13 @@ pub struct CSlotList {
/// Pointer to the first slot of the list
pub slots: *const CSlot,
/// Number of slots in the list
pub size: libc::int32_t, // Note: we can't use `libc::size_t` because it's not supported by JNA
pub size: i32, // Note: we can't use `libc::size_t` because it's not supported by JNA
}

impl From<Vec<Slot>> for CSlotList {
fn from(input: Vec<Slot>) -> Self {
Self {
size: input.len() as libc::int32_t,
size: input.len() as i32,
slots: Box::into_raw(
input
.into_iter()
Expand Down Expand Up @@ -300,9 +300,9 @@ pub struct CSlot {
/// Name of the slot
pub slot_name: *const libc::c_char,
/// Start index of raw value in input text
pub range_start: libc::int32_t,
pub range_start: i32,
/// End index of raw value in input text
pub range_end: libc::int32_t,
pub range_end: i32,
/// Confidence score of the slot
pub confidence_score: libc::c_float,
}
Expand All @@ -313,8 +313,8 @@ impl From<Slot> for CSlot {
raw_value: CString::new(input.raw_value).unwrap().into_raw(),
value: CSlotValue::from(input.value).into_raw_pointer(),
alternatives: CSlotValueArray::from(input.alternatives).into_raw_pointer(),
range_start: input.range.start as libc::int32_t,
range_end: input.range.end as libc::int32_t,
range_start: input.range.start as i32,
range_end: input.range.end as i32,
entity: CString::new(input.entity).unwrap().into_raw(),
slot_name: CString::new(input.slot_name).unwrap().into_raw(),
confidence_score: input
Expand Down Expand Up @@ -348,8 +348,8 @@ impl Drop for CSlot {
take_back_c_string!(self.raw_value);
take_back_c_string!(self.entity);
take_back_c_string!(self.slot_name);
unsafe { CSlotValue::drop_raw_pointer(self.value) };
unsafe { CSlotValueArray::drop_raw_pointer(self.alternatives) };
let _ = unsafe { CSlotValue::drop_raw_pointer(self.value) };
let _ = unsafe { CSlotValueArray::drop_raw_pointer(self.alternatives) };
}
}

Expand Down Expand Up @@ -448,7 +448,7 @@ pub type CNumberValue = libc::c_double;
/// Representation of a percentage value
pub type CPercentageValue = libc::c_double;
/// Representation of an ordinal value
pub type COrdinalValue = libc::int64_t;
pub type COrdinalValue = i64;

/// Enum representing the grain of a resolved date related value
#[repr(C)]
Expand Down Expand Up @@ -668,36 +668,36 @@ impl Drop for CTemperatureValue {
#[derive(Debug)]
pub struct CDurationValue {
/// Number of years in the duration
pub years: libc::int64_t,
pub years: i64,
/// Number of quarters in the duration
pub quarters: libc::int64_t,
pub quarters: i64,
/// Number of months in the duration
pub months: libc::int64_t,
pub months: i64,
/// Number of weeks in the duration
pub weeks: libc::int64_t,
pub weeks: i64,
/// Number of days in the duration
pub days: libc::int64_t,
pub days: i64,
/// Number of hours in the duration
pub hours: libc::int64_t,
pub hours: i64,
/// Number of minutes in the duration
pub minutes: libc::int64_t,
pub minutes: i64,
/// Number of seconds in the duration
pub seconds: libc::int64_t,
pub seconds: i64,
/// Precision of the resolved value
pub precision: SNIPS_PRECISION,
}

impl From<DurationValue> for CDurationValue {
fn from(value: DurationValue) -> Self {
Self {
years: value.years as libc::int64_t,
quarters: value.quarters as libc::int64_t,
months: value.months as libc::int64_t,
weeks: value.weeks as libc::int64_t,
days: value.days as libc::int64_t,
hours: value.hours as libc::int64_t,
minutes: value.minutes as libc::int64_t,
seconds: value.seconds as libc::int64_t,
years: value.years as i64,
quarters: value.quarters as i64,
months: value.months as i64,
weeks: value.weeks as i64,
days: value.days as i64,
hours: value.hours as i64,
minutes: value.minutes as i64,
seconds: value.seconds as i64,
precision: SNIPS_PRECISION::from(value.precision),
}
}
Expand Down Expand Up @@ -827,7 +827,7 @@ impl AsRust<SlotValue> for CSlotValue {

impl Drop for CSlotValue {
fn drop(&mut self) {
unsafe {
let _ = unsafe {
match self.value_type {
SNIPS_SLOT_VALUE_TYPE::SNIPS_SLOT_VALUE_TYPE_CUSTOM => {
CString::drop_raw_pointer(self.value)
Expand Down Expand Up @@ -886,13 +886,13 @@ pub struct CSlotValueArray {
/// Pointer to the first slot value of the list
pub slot_values: *const CSlotValue,
/// Number of slot values in the list
pub size: libc::int32_t, // Note: we can't use `libc::size_t` because it's not supported by JNA
pub size: i32, // Note: we can't use `libc::size_t` because it's not supported by JNA
}

impl From<Vec<SlotValue>> for CSlotValueArray {
fn from(input: Vec<SlotValue>) -> Self {
Self {
size: input.len() as libc::int32_t,
size: input.len() as i32,
slot_values: Box::into_raw(
input
.into_iter()
Expand Down
2 changes: 1 addition & 1 deletion platforms/kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}
}

version = "0.67.0-SNAPSHOT"
version = "0.67.0"
group = "ai.snips"


Expand Down